diff options
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index ea1d005be92..43526a2d275 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -147,6 +147,7 @@ struct bond_params {  	int updelay;  	int downdelay;  	int lacp_fast; +	unsigned int min_links;  	int ad_select;  	char primary[IFNAMSIZ];  	int primary_reselect; @@ -239,8 +240,6 @@ struct bonding {  	struct   alb_bond_info alb_info;  	struct   bond_params params;  	struct   list_head vlan_list; -	struct   vlan_group *vlgrp; -	struct   packet_type arp_mon_pt;  	struct   workqueue_struct *wq;  	struct   delayed_work mii_work;  	struct   delayed_work arp_work; @@ -253,6 +252,11 @@ struct bonding {  #endif /* CONFIG_DEBUG_FS */  }; +static inline bool bond_vlan_used(struct bonding *bond) +{ +	return !list_empty(&bond->vlan_list); +} +  #define bond_slave_get_rcu(dev) \  	((struct slave *) rcu_dereference(dev->rx_handler_data))  |