X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Frose%2Faf_rose.c;h=a7f1ce11bc22d140d52526c11816973d05683729;hb=6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718;hp=7dbbc08916236009f3ed933c3cbbb85143bd0523;hpb=c773e847ea8f6812804e40f52399c6921a00eab1;p=linux-2.6

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 7dbbc08916..a7f1ce11bc 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -74,15 +74,19 @@ ax25_address rose_callsign;
  * separate class since they always nest.
  */
 static struct lock_class_key rose_netdev_xmit_lock_key;
+static struct lock_class_key rose_netdev_addr_lock_key;
 
-static void rose_set_lockdep_one(struct netdev_queue *txq)
+static void rose_set_lockdep_one(struct net_device *dev,
+				 struct netdev_queue *txq,
+				 void *_unused)
 {
 	lockdep_set_class(&txq->_xmit_lock, &rose_netdev_xmit_lock_key);
 }
 
 static void rose_set_lockdep_key(struct net_device *dev)
 {
-	rose_set_lockdep_one(&dev->tx_queue);
+	lockdep_set_class(&dev->addr_list_lock, &rose_netdev_addr_lock_key);
+	netdev_for_each_tx_queue(dev, rose_set_lockdep_one, NULL);
 }
 
 /*
@@ -207,7 +211,7 @@ static int rose_device_event(struct notifier_block *this, unsigned long event,
 {
 	struct net_device *dev = (struct net_device *)ptr;
 
-	if (dev_net(dev) != &init_net)
+	if (!net_eq(dev_net(dev), &init_net))
 		return NOTIFY_DONE;
 
 	if (event != NETDEV_DOWN)