diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-16 15:37:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-16 15:37:26 -0700 |
| commit | 2ff1cf12c9fe70e75e600404e6a4274b19d293ed (patch) | |
| tree | beafddac0a8098e3f07d2ec60e44a2a7d006e605 /net/8021q | |
| parent | 16b304f3404f8e0243d5ee2b70b68767b7b59b2b (diff) | |
| parent | 0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a (diff) | |
| download | blackbird-op-linux-2ff1cf12c9fe70e75e600404e6a4274b19d293ed.tar.gz blackbird-op-linux-2ff1cf12c9fe70e75e600404e6a4274b19d293ed.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 4a78c4de9f20..6ee48aac776f 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -91,7 +91,12 @@ EXPORT_SYMBOL(__vlan_find_dev_deep); struct net_device *vlan_dev_real_dev(const struct net_device *dev) { - return vlan_dev_priv(dev)->real_dev; + struct net_device *ret = vlan_dev_priv(dev)->real_dev; + + while (is_vlan_dev(ret)) + ret = vlan_dev_priv(ret)->real_dev; + + return ret; } EXPORT_SYMBOL(vlan_dev_real_dev); |
