bonding: xor/802.3ad improved slave hash

[safe/jmp/linux-2.6] / drivers / net / bonding / bonding.h

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 6558af2..d27f377 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -25,6 +25,10 @@
  *
  * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
  *     - Code cleanup and style changes
+ *
+ * 2005/05/05 - Jason Gabler <jygabler at lbl dot gov>
+ *      - added "xmit_policy" kernel parameter for alternate hashing policy
+ *       support for mode 2
  */
 
 #ifndef _LINUX_BONDING_H
@@ -36,8 +40,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION    "2.6.2"
-#define DRV_RELDATE    "June 5, 2005"
+#define DRV_VERSION    "2.6.3"
+#define DRV_RELDATE    "June 8, 2005"
 #define DRV_NAME       "bonding"
 #define DRV_DESCRIPTION        "Ethernet Channel Bonding Driver"
 
@@ -137,6 +141,7 @@
 
 struct bond_params {
        int mode;
+       int xmit_policy;
        int miimon;
        int arp_interval;
        int use_carrier;
@@ -198,6 +203,7 @@ struct bonding {
 #endif /* CONFIG_PROC_FS */
        struct   list_head bond_list;
        struct   dev_mc_list *mc_list;
+       int      (*xmit_hash_policy)(struct sk_buff *, struct net_device *, int);
        u32      master_ip;
        u16      flags;
        struct   ad_bond_info ad_info;