diff options
author | David Lamparter <equinox@diac24.net> | 2011-07-17 08:53:12 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-17 12:33:22 -0700 |
commit | 69ecca86da4890c13a5e29c51b4ac76a1a8a62c9 (patch) | |
tree | 3a0084284ef48af692f7471a5736b0099912a77a /net/8021q/vlan.h | |
parent | 178edcbc6b539dfc21062fed9bf31701a8952e1c (diff) | |
download | linux-stable-69ecca86da4890c13a5e29c51b4ac76a1a8a62c9.tar.gz linux-stable-69ecca86da4890c13a5e29c51b4ac76a1a8a62c9.tar.bz2 linux-stable-69ecca86da4890c13a5e29c51b4ac76a1a8a62c9.zip |
net: vlan, qlcnic: make vlan_find_dev private
there is only one user of vlan_find_dev outside of the actual vlan code:
qlcnic uses it to iterate over some VLANs it knows.
let's just make vlan_find_dev private to the VLAN code and have the
iteration in qlcnic be a bit more direct. (a few rcu dereferences less
too)
Signed-off-by: David Lamparter <equinox@diac24.net>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Amit Kumar Salecha <amit.salecha@qlogic.com>
Cc: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Cc: linux-driver@qlogic.com
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.h')
-rw-r--r-- | net/8021q/vlan.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 9da07e30d1a2..b132f542b44b 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -74,6 +74,18 @@ static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev) return netdev_priv(dev); } +/* Must be invoked with rcu_read_lock or with RTNL. */ +static inline struct net_device *vlan_find_dev(struct net_device *real_dev, + u16 vlan_id) +{ + struct vlan_group *grp = rcu_dereference_rtnl(real_dev->vlgrp); + + if (grp) + return vlan_group_get_device(grp, vlan_id); + + return NULL; +} + /* found in vlan_dev.c */ void vlan_dev_set_ingress_priority(const struct net_device *dev, u32 skb_prio, u16 vlan_prio); |