From c0896dc80a27c4fd4c8575967303ffa34beda4a9 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Thu, 10 Jan 2008 22:38:31 -0800 Subject: [PATCH] --- yaml --- r: 75495 b: refs/heads/master c: 0fe1e567d0b4f6a98e94d3b9a40f41c801bd157f h: refs/heads/master i: 75493: f21f76084f6f592790faba796c2fa05949e27ad7 75491: aca94500e637c6889b97257655342f9d327f8b24 75487: 3159dbe1c2f6e375f4420aea74a903c781576937 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 965689575bc4..2c6861fb9071 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d89d7944fead211422e21fb7ea70ed3b903a79e +refs/heads/master: 0fe1e567d0b4f6a98e94d3b9a40f41c801bd157f diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index 4add9bd4bc8d..032bf44eca5e 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -323,6 +323,7 @@ static const struct header_ops vlan_header_ops = { static int vlan_dev_init(struct net_device *dev) { struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev; + int subclass = 0; /* IFF_BROADCAST|IFF_MULTICAST; ??? */ dev->flags = real_dev->flags & ~IFF_UP; @@ -349,7 +350,11 @@ static int vlan_dev_init(struct net_device *dev) dev->hard_start_xmit = vlan_dev_hard_start_xmit; } - lockdep_set_class(&dev->_xmit_lock, &vlan_netdev_xmit_lock_key); + if (real_dev->priv_flags & IFF_802_1Q_VLAN) + subclass = 1; + + lockdep_set_class_and_subclass(&dev->_xmit_lock, + &vlan_netdev_xmit_lock_key, subclass); return 0; }