aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bonding.h
diff options
context:
space:
mode:
authorJay Vosburgh <fubar@us.ibm.com>2005-06-26 17:52:20 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 17:52:20 -0400
commitc3ade5cad07f4d67f2e16a28f3c73d9483a55e0e (patch)
tree198f479dbcb793ad84cbb23d8f5f049253de5f07 /drivers/net/bonding/bonding.h
parent12755c16a9e4fa2fd5b0ca1963e83d671a6251da (diff)
bonding: gratuitous ARP
Add support for generating gratuitous ARPs in bonding active-backup mode when failovers occur. Includes support for VLAN tagging the ARPs as needed. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r--drivers/net/bonding/bonding.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 8c325308489d..6558af22eda4 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -36,8 +36,8 @@
36#include "bond_3ad.h" 36#include "bond_3ad.h"
37#include "bond_alb.h" 37#include "bond_alb.h"
38 38
39#define DRV_VERSION "2.6.1" 39#define DRV_VERSION "2.6.2"
40#define DRV_RELDATE "October 29, 2004" 40#define DRV_RELDATE "June 5, 2005"
41#define DRV_NAME "bonding" 41#define DRV_NAME "bonding"
42#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver" 42#define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
43 43
@@ -149,6 +149,7 @@ struct bond_params {
149 149
150struct vlan_entry { 150struct vlan_entry {
151 struct list_head vlan_list; 151 struct list_head vlan_list;
152 u32 vlan_ip;
152 unsigned short vlan_id; 153 unsigned short vlan_id;
153}; 154};
154 155
@@ -197,6 +198,7 @@ struct bonding {
197#endif /* CONFIG_PROC_FS */ 198#endif /* CONFIG_PROC_FS */
198 struct list_head bond_list; 199 struct list_head bond_list;
199 struct dev_mc_list *mc_list; 200 struct dev_mc_list *mc_list;
201 u32 master_ip;
200 u16 flags; 202 u16 flags;
201 struct ad_bond_info ad_info; 203 struct ad_bond_info ad_info;
202 struct alb_bond_info alb_info; 204 struct alb_bond_info alb_info;