Add round-robin "hash" too.

diff --git a/linux-2.6-720-bonding-hashes.patch b/linux-2.6-720-bonding-hashes.patch
index 5a0be1d..080c3e5 100644 (file)
--- a/linux-2.6-720-bonding-hashes.patch
+++ b/linux-2.6-720-bonding-hashes.patch
@@ -1,6 +1,6 @@
 diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c
 --- linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c 2007-09-05 07:07:59.000000000 +0200
-+++ linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c 2009-06-15 19:26:31.000000000 +0200
++++ linux-2.6.22.19-vs2.3.0.34.bonding/drivers/net/bonding/bond_main.c 2009-06-15 21:52:30.000000000 +0200
 @@ -123,7 +123,7 @@ MODULE_PARM_DESC(lacp_rate, "LACPDU tx r
                            "(slow/fast)");
  module_param(xmit_hash_policy, charp, 0);
@@ -10,16 +10,17 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
  module_param(arp_interval, int, 0);
  MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
  module_param_array(arp_ip_target, charp, NULL, 0);
-@@ -170,6 +170,8 @@ struct bond_parm_tbl bond_mode_tbl[] = {
+@@ -170,6 +170,9 @@ struct bond_parm_tbl bond_mode_tbl[] = {
  struct bond_parm_tbl xmit_hashtype_tbl[] = {
  {     "layer2",               BOND_XMIT_POLICY_LAYER2},
  {     "layer3+4",             BOND_XMIT_POLICY_LAYER34},
 +{     "layer2+3",             BOND_XMIT_POLICY_LAYER23},
 +{     "layer3",               BOND_XMIT_POLICY_LAYER3},
++{     "rr",                   BOND_XMIT_POLICY_RR},
  {     NULL,                   -1},
  };
  
-@@ -3447,6 +3449,40 @@ void bond_unregister_arp(struct bonding 
+@@ -3447,6 +3450,40 @@ void bond_unregister_arp(struct bonding 
  }
  
  /*---------------------------- Hashing Policies -----------------------------*/
@@ -60,7 +61,24 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
  
  /*
   * Hash for the output device based upon layer 3 and layer 4 data. If
-@@ -4183,6 +4219,10 @@ void bond_set_mode_ops(struct bonding *b
+@@ -3486,6 +3523,16 @@ static int bond_xmit_hash_policy_l2(stru
+       return (data->h_dest[5] ^ bond_dev->dev_addr[5]) % count;
+ }
+ 
++/*
++ * Round-robin "hashing" algorithm
++ */
++static int bond_xmit_hash_policy_rr(struct sk_buff *skb,
++                                  struct net_device *bond_dev, int count)
++{
++      static atomic_t packets;
++      return atomic_inc_return(packets) % count;
++}
++
+ /*-------------------------- Device entry points ----------------------------*/
+ 
+ static int bond_open(struct net_device *bond_dev)
+@@ -4183,6 +4230,12 @@ void bond_set_mode_ops(struct bonding *b
                bond_dev->hard_start_xmit = bond_xmit_xor;
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
@@ -68,10 +86,12 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
 +                      bond->xmit_hash_policy = bond_xmit_hash_policty_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)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
                else
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
-@@ -4194,6 +4234,10 @@ void bond_set_mode_ops(struct bonding *b
+@@ -4194,6 +4247,12 @@ void bond_set_mode_ops(struct bonding *b
                bond_dev->hard_start_xmit = bond_3ad_xmit_xor;
                if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34)
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l34;
@@ -79,18 +99,21 @@ diff -Nurp linux-2.6.22.19-vs2.3.0.34/drivers/net/bonding/bond_main.c linux-2.6.
 +                      bond->xmit_hash_policy = bond_xmit_hash_policty_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)
++                      bond->xmit_hash_policy = bond_xmit_hash_policy_rr;
                else
                        bond->xmit_hash_policy = bond_xmit_hash_policy_l2;
                break;
 diff -Nurp linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h
 --- linux-2.6.22.19-vs2.3.0.34/include/linux/if_bonding.h      2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h      2009-06-15 19:29:16.000000000 +0200
-@@ -86,6 +86,8 @@
++++ linux-2.6.22.19-vs2.3.0.34.bonding/include/linux/if_bonding.h      2009-06-15 22:02:09.000000000 +0200
+@@ -86,6 +86,9 @@
  /* hashing types */
  #define BOND_XMIT_POLICY_LAYER2               0 /* layer 2 (MAC only), default */
  #define BOND_XMIT_POLICY_LAYER34      1 /* layer 3+4 (IP ^ MAC) */
 +#define BOND_XMIT_POLICY_LAYER23      2 /* layer 2+3 (IP ^ MAC) */
 +#define BOND_XMIT_POLICY_LAYER3               3 /* layer3 (IP only) */
++#define BOND_XMIT_POLICY_RR           255 /* round-robin */
  
  typedef struct ifbond {
        __s32 bond_mode;