diff options
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 6 |
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 | ||
150 | struct vlan_entry { | 150 | struct 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; |