diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2014-05-16 17:04:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-16 22:14:49 -0400 |
| commit | d38569ab2bba6e6b3233acfc3a84cdbcfbd1f79f (patch) | |
| tree | 12d0b7fb2b3fb8256c226ef09ed42a539decddf9 /net/8021q/vlan.c | |
| parent | 25175ba5c9bff9aaf0229df34bb5d54c81633ec3 (diff) | |
| download | linux-d38569ab2bba6e6b3233acfc3a84cdbcfbd1f79f.tar.gz linux-d38569ab2bba6e6b3233acfc3a84cdbcfbd1f79f.tar.bz2 linux-d38569ab2bba6e6b3233acfc3a84cdbcfbd1f79f.zip | |
vlan: Fix lockdep warning with stacked vlan devices.
This reverts commit dc8eaaa006350d24030502a4521542e74b5cb39f.
vlan: Fix lockdep warning when vlan dev handle notification
Instead we use the new new API to find the lock subclass of
our vlan device. This way we can support configurations where
vlans are interspersed with other devices:
bond -> vlan -> macvlan -> vlan
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 175273f38cb1..44ebd5c2cd4a 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -169,6 +169,7 @@ int register_vlan_dev(struct net_device *dev) if (err < 0) goto out_uninit_mvrp; + vlan->nest_level = dev_get_nest_level(real_dev, is_vlan_dev) + 1; err = register_netdevice(dev); if (err < 0) goto out_uninit_mvrp; |