git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e5807c)
sync bonding patches
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 22 Dec 2009 22:18:09 +0000 (22:18 +0000)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 22 Dec 2009 22:18:09 +0000 (22:18 +0000)
linux-2.6-721-bonding-layer3.patch patch | blob | history
linux-2.6-722-bonding-rr.patch patch | blob | history

diff --git a/linux-2.6-721-bonding-layer3.patch b/linux-2.6-721-bonding-layer3.patch
index 521b318..433c32b 100644 (file)
--- a/linux-2.6-721-bonding-layer3.patch
+++ b/linux-2.6-721-bonding-layer3.patch
@@ -32,7 +32,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c linu
   * Hash for the output device based upon layer 2 and layer 3 data. If
   * the packet is not IP mimic bond_xmit_hash_policy_l2()
   */
-@@ -4204,7 +4221,9 @@ void bond_set_mode_ops(struct bonding *b
+@@ -4204,6 +4221,8 @@ void bond_set_mode_ops(struct bonding *b
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
                else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
@@ -41,8 +41,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond1/drivers/net/bonding/bond_main.c linu
                else
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
-@@ -4217,7 +4236,9 @@ void bond_set_mode_ops(struct bonding *b
-               if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
+@@ -4217,6 +4236,8 @@ void bond_set_mode_ops(struct bonding *b
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
                else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
diff --git a/linux-2.6-722-bonding-rr.patch b/linux-2.6-722-bonding-rr.patch
index 8b363da..0bddd68 100644 (file)
--- a/linux-2.6-722-bonding-rr.patch
+++ b/linux-2.6-722-bonding-rr.patch
@@ -20,7 +20,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34.bond2/drivers/net/bonding/bond_main.c linu
 +                                  struct net_device *bond_dev, int count)
 +{
 +      static atomic_t packets;
-+      return atomic_inc_return(packets) % count;
++      return atomic_inc_return(&packets) % count;
 +}
 +
  /*-------------------------- Device entry points ----------------------------*/
linux-2.6