git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a0eb79b)
Fix typos.
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 15 Jun 2009 20:30:29 +0000 (20:30 +0000)
committerDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Mon, 15 Jun 2009 20:30:29 +0000 (20:30 +0000)
linux-2.6-720-bonding-hashes.patch patch | blob | history

diff --git a/linux-2.6-720-bonding-hashes.patch b/linux-2.6-720-bonding-hashes.patch
index 080c3e5..77bf8aa 100644 (file)
--- a/linux-2.6-720-bonding-hashes.patch
+++ b/linux-2.6-720-bonding-hashes.patch
@@ -72,7 +72,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
 +                                  struct net_device *bond_dev, int count)
 +{
 +      static atomic_t packets;
 +                                  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 ----------------------------*/
 +}
 +
  /*-------------------------- Device entry points ----------------------------*/
@@ -83,7 +83,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        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_policty_l23;
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
@@ -96,7 +96,7 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23)
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        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_policty_l23;
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_l23;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER3)
 +                      bond->xmit_hash_policy = bond_xmit_hash_policy_l3;
 +              else if (bond->params.xmit_policy == BOND_XMIT_POLICY_RR)
linux-2.6