diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 00:54:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:47:58 -0400 |
commit | cc0e40700656b09d93b062ef6c818aa45429d09a (patch) | |
tree | e9501fb2576086a2bb932b8db872276e29340450 /drivers/net/bonding/bonding.h | |
parent | 9d846fec22db7b4876353e5e6e97dfc0878b6ada (diff) |
bonding: do vlan cleanup
Now when all devices are cleaned up, bond can be cleaned up as well
- remove bond->vlgrp
- remove bond_vlan_rx_register
- substitute necessary occurences of vlan_group_get_device
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r-- | drivers/net/bonding/bonding.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 2936171f5332..43526a2d275c 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -240,7 +240,6 @@ struct bonding { | |||
240 | struct alb_bond_info alb_info; | 240 | struct alb_bond_info alb_info; |
241 | struct bond_params params; | 241 | struct bond_params params; |
242 | struct list_head vlan_list; | 242 | struct list_head vlan_list; |
243 | struct vlan_group *vlgrp; | ||
244 | struct workqueue_struct *wq; | 243 | struct workqueue_struct *wq; |
245 | struct delayed_work mii_work; | 244 | struct delayed_work mii_work; |
246 | struct delayed_work arp_work; | 245 | struct delayed_work arp_work; |
@@ -253,6 +252,11 @@ struct bonding { | |||
253 | #endif /* CONFIG_DEBUG_FS */ | 252 | #endif /* CONFIG_DEBUG_FS */ |
254 | }; | 253 | }; |
255 | 254 | ||
255 | static inline bool bond_vlan_used(struct bonding *bond) | ||
256 | { | ||
257 | return !list_empty(&bond->vlan_list); | ||
258 | } | ||
259 | |||
256 | #define bond_slave_get_rcu(dev) \ | 260 | #define bond_slave_get_rcu(dev) \ |
257 | ((struct slave *) rcu_dereference(dev->rx_handler_data)) | 261 | ((struct slave *) rcu_dereference(dev->rx_handler_data)) |
258 | 262 | ||