From: S.Çağlar Onur Date: Tue, 22 Dec 2009 22:18:09 +0000 (+0000) Subject: sync bonding patches X-Git-Tag: linux-2.6-22-41.coblitz~7 X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=229ff18de6bc68ed7f0d8f09c2a9ae060375c5ab sync bonding patches --- diff --git a/linux-2.6-721-bonding-layer3.patch b/linux-2.6-721-bonding-layer3.patch index 521b318a7..433c32b90 100644 --- 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 8b363dace..0bddd685d 100644 --- 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 ----------------------------*/