diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-22 17:16:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-22 17:16:42 -0400 |
commit | cf508b1211dbe576778ff445ea1b4b0bcfa5c4ea (patch) | |
tree | 4774838c2db17db71662a625fea25def8823341a /drivers/net/bonding | |
parent | d29f749e252bcdbfe7a75a58f0ee92da16f127c0 (diff) |
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 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9737c06045d6..a641eeaa2a2f 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -5041,6 +5041,7 @@ static int bond_check_params(struct bond_params *params) | |||
5041 | } | 5041 | } |
5042 | 5042 | ||
5043 | static struct lock_class_key bonding_netdev_xmit_lock_key; | 5043 | static struct lock_class_key bonding_netdev_xmit_lock_key; |
5044 | static struct lock_class_key bonding_netdev_addr_lock_key; | ||
5044 | 5045 | ||
5045 | static void bond_set_lockdep_class_one(struct net_device *dev, | 5046 | static void bond_set_lockdep_class_one(struct net_device *dev, |
5046 | struct netdev_queue *txq, | 5047 | struct netdev_queue *txq, |
@@ -5052,6 +5053,8 @@ static void bond_set_lockdep_class_one(struct net_device *dev, | |||
5052 | 5053 | ||
5053 | static void bond_set_lockdep_class(struct net_device *dev) | 5054 | static void bond_set_lockdep_class(struct net_device *dev) |
5054 | { | 5055 | { |
5056 | lockdep_set_class(&dev->addr_list_lock, | ||
5057 | &bonding_netdev_addr_lock_key); | ||
5055 | netdev_for_each_tx_queue(dev, bond_set_lockdep_class_one, NULL); | 5058 | netdev_for_each_tx_queue(dev, bond_set_lockdep_class_one, NULL); |
5056 | } | 5059 | } |
5057 | 5060 | ||