diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 06:54:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 22:47:53 +0200 |
| commit | cec9c133631039f82e4a5ff3bf47b3eba14ff1aa (patch) | |
| tree | 073fa703b248a8546a5b14f13998785834736a97 /net/8021q | |
| parent | vlan: finish removing vlan_find_dev from public header (diff) | |
| download | linux-cec9c133631039f82e4a5ff3bf47b3eba14ff1aa.tar.xz linux-cec9c133631039f82e4a5ff3bf47b3eba14ff1aa.zip | |
vlan: introduce __vlan_find_dev_deep()
Since vlan_group_get_device and vlan_group is not going to be accessible
from device drivers, introduce function which substitutes it.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index fcc684678af6..5940366fac48 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -63,6 +63,27 @@ bool vlan_do_receive(struct sk_buff **skbp) return true; } +/* Must be invoked with rcu_read_lock or with RTNL. */ +struct net_device *__vlan_find_dev_deep(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); + } else { + /* + * Bonding slaves do not have grp assigned to themselves. + * Grp is assigned to bonding master instead. + */ + if (netif_is_bond_slave(real_dev)) + return __vlan_find_dev_deep(real_dev->master, vlan_id); + } + + return NULL; +} +EXPORT_SYMBOL(__vlan_find_dev_deep); + struct net_device *vlan_dev_real_dev(const struct net_device *dev) { return vlan_dev_info(dev)->real_dev; |