1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 68247714466f..9c03c2ee074d 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -23,8 +23,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
 
-#define DRV_VERSION     "3.5.0"
-#define DRV_RELDATE     "November 4, 2008"
+#define DRV_VERSION     "3.6.0"
+#define DRV_RELDATE     "September 26, 2009"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
 
@@ -131,6 +131,7 @@ struct bond_params {
         int lacp_fast;
         int ad_select;
         char primary[IFNAMSIZ];
+        int primary_reselect;
         __be32 arp_targets[BOND_MAX_ARP_TARGETS];
 };
 
@@ -190,6 +191,7 @@ struct bonding {
         struct   slave *curr_active_slave;
         struct   slave *current_arp_slave;
         struct   slave *primary_slave;
+        bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
         rwlock_t lock;
         rwlock_t curr_slave_lock;
@@ -258,6 +260,10 @@ static inline bool bond_is_lb(const struct bonding *bond)
                 || bond->params.mode == BOND_MODE_ALB;
 }
 
+#define BOND_PRI_RESELECT_ALWAYS        0
+#define BOND_PRI_RESELECT_BETTER        1
+#define BOND_PRI_RESELECT_FAILURE       2
+
 #define BOND_FOM_NONE                   0
 #define BOND_FOM_ACTIVE                 1
 #define BOND_FOM_FOLLOW                 2
@@ -348,6 +354,7 @@ extern const struct bond_parm_tbl bond_mode_tbl[];
 extern const struct bond_parm_tbl xmit_hashtype_tbl[];
 extern const struct bond_parm_tbl arp_validate_tbl[];
 extern const struct bond_parm_tbl fail_over_mac_tbl[];
+extern const struct bond_parm_tbl pri_reselect_tbl[];
 extern struct bond_parm_tbl ad_select_tbl[];
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)