aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.h
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2011-07-17 04:53:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-17 15:33:22 -0400
commit69ecca86da4890c13a5e29c51b4ac76a1a8a62c9 (patch)
tree3a0084284ef48af692f7471a5736b0099912a77a /net/8021q/vlan.h
parent178edcbc6b539dfc21062fed9bf31701a8952e1c (diff)
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.h12
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)
74 return netdev_priv(dev); 74 return netdev_priv(dev);
75} 75}
76 76
77/* Must be invoked with rcu_read_lock or with RTNL. */
78static inline struct net_device *vlan_find_dev(struct net_device *real_dev,
79 u16 vlan_id)
80{
81 struct vlan_group *grp = rcu_dereference_rtnl(real_dev->vlgrp);
82
83 if (grp)
84 return vlan_group_get_device(grp, vlan_id);
85
86 return NULL;
87}
88
77/* found in vlan_dev.c */ 89/* found in vlan_dev.c */
78void vlan_dev_set_ingress_priority(const struct net_device *dev, 90void vlan_dev_set_ingress_priority(const struct net_device *dev,
79 u32 skb_prio, u16 vlan_prio); 91 u32 skb_prio, u16 vlan_prio);