diff options
author | Veaceslav Falico <vfalico@redhat.com> | 2013-08-29 17:38:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-03 22:02:32 -0400 |
commit | 6f477d420183f7cacc73f46a93e12961cb234e91 (patch) | |
tree | 0baa9ee3f525c6a5b18b3fe5a7990813dc64557d /drivers/net/bonding/bonding.h | |
parent | c12a22428ae773eff27bad490d35028fe036bf35 (diff) |
bonding: remove bond_vlan_used()
We're using it currently to verify if we have vlans before getting the tag
from the skb we're about to send. It's useless because the vlan_get_tag()
verifies if the skb has the tag (and returns an error if not), and we can
receive tagged skbs only if we *already* have vlans.
Plus, the current RCUed implementation is kind of useless anyway - the we
can remove the last vlan in the moment we return from the function.
So remove the only usage of it and the whole function.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@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 | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 4abc925823e1..f7ab16185f68 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -261,24 +261,6 @@ struct bonding { | |||
261 | #endif /* CONFIG_DEBUG_FS */ | 261 | #endif /* CONFIG_DEBUG_FS */ |
262 | }; | 262 | }; |
263 | 263 | ||
264 | /* if we hold rtnl_lock() - call vlan_uses_dev() */ | ||
265 | static inline bool bond_vlan_used(struct bonding *bond) | ||
266 | { | ||
267 | struct net_device *upper; | ||
268 | struct list_head *iter; | ||
269 | |||
270 | rcu_read_lock(); | ||
271 | netdev_for_each_upper_dev_rcu(bond->dev, upper, iter) { | ||
272 | if (upper->priv_flags & IFF_802_1Q_VLAN) { | ||
273 | rcu_read_unlock(); | ||
274 | return true; | ||
275 | } | ||
276 | } | ||
277 | rcu_read_unlock(); | ||
278 | |||
279 | return false; | ||
280 | } | ||
281 | |||
282 | #define bond_slave_get_rcu(dev) \ | 264 | #define bond_slave_get_rcu(dev) \ |
283 | ((struct slave *) rcu_dereference(dev->rx_handler_data)) | 265 | ((struct slave *) rcu_dereference(dev->rx_handler_data)) |
284 | 266 | ||