diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-22 14:16:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-22 14:16:42 -0700 |
| commit | cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea (patch) | |
| tree | 4774838c2db17db71662a625fea25def8823341a /net/8021q | |
| parent | d29f749e252bcdbfe7a75a58f0ee92da16f127c0 (diff) | |
| download | linux-stable-cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea.tar.gz linux-stable-cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea.tar.bz2 linux-stable-cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea.zip | |
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
The new address list lock needs to handle the same device layering
issues that the _xmit_lock one does.
This integrates work done by Patrick McHardy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index f42bc2b26b85..4bf014e51f8c 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -569,6 +569,7 @@ static void vlan_dev_set_rx_mode(struct net_device *vlan_dev) * separate class since they always nest. */ static struct lock_class_key vlan_netdev_xmit_lock_key; +static struct lock_class_key vlan_netdev_addr_lock_key; static void vlan_dev_set_lockdep_one(struct net_device *dev, struct netdev_queue *txq, @@ -581,6 +582,9 @@ static void vlan_dev_set_lockdep_one(struct net_device *dev, static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass) { + lockdep_set_class_and_subclass(&dev->addr_list_lock, + &vlan_netdev_addr_lock_key, + subclass); netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass); } |