4 files changed, 27 insertions, 18 deletions

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 3669cb953e6e..1d50f801f181 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -8,7 +8,6 @@
  * Copyright Alan Cox GW4PTS (alan@lxorguk.ukuu.org.uk)
  * Copyright Darryl Miles G7LED (dlm@g7led.demon.co.uk)
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/capability.h>
@@ -67,6 +66,14 @@ static DEFINE_SPINLOCK(nr_list_lock);
 static const struct proto_ops nr_proto_ops;
 
 /*
+ * NETROM network devices are virtual network devices encapsulating NETROM
+ * frames into AX.25 which will be sent through an AX.25 device, so form a
+ * special "super class" of normal net devices; split their locks off into a
+ * separate class since they always nest.
+ */
+static struct lock_class_key nr_netdev_xmit_lock_key;
+
+/*
  *      Socket removal during an interrupt is now safe.
  */
 static void nr_remove_socket(struct sock *sk)
@@ -801,7 +808,7 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags)
 
         /* Now attach up the new socket */
         kfree_skb(skb);
-        sk->sk_ack_backlog--;
+        sk_acceptq_removed(sk);
         newsock->sk = newsk;
 
 out:
@@ -986,19 +993,19 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev)
         nr_make->vr        = 0;
         nr_make->vl        = 0;
         nr_make->state     = NR_STATE_3;
-        sk->sk_ack_backlog++;
-
-        nr_insert_socket(make);
-
+        sk_acceptq_added(sk);
         skb_queue_head(&sk->sk_receive_queue, skb);
 
-        nr_start_heartbeat(make);
-        nr_start_idletimer(make);
-
         if (!sock_flag(sk, SOCK_DEAD))
                 sk->sk_data_ready(sk, skb->len);
 
         bh_unlock_sock(sk);
+
+        nr_insert_socket(make);
+
+        nr_start_heartbeat(make);
+        nr_start_idletimer(make);
+
         return 1;
 }
 
@@ -1383,14 +1390,12 @@ static int __init nr_proto_init(void)
                 return -1;
         }
 
-        dev_nr = kmalloc(nr_ndevs * sizeof(struct net_device *), GFP_KERNEL);
+        dev_nr = kzalloc(nr_ndevs * sizeof(struct net_device *), GFP_KERNEL);
         if (dev_nr == NULL) {
                 printk(KERN_ERR "NET/ROM: nr_proto_init - unable to allocate device array\n");
                 return -1;
         }
 
-        memset(dev_nr, 0x00, nr_ndevs * sizeof(struct net_device *));
-
         for (i = 0; i < nr_ndevs; i++) {
                 char name[IFNAMSIZ];
                 struct net_device *dev;
@@ -1408,6 +1413,7 @@ static int __init nr_proto_init(void)
                         free_netdev(dev);
                         goto fail;
                 }
+                lockdep_set_class(&dev->_xmit_lock, &nr_netdev_xmit_lock_key);
                 dev_nr[i] = dev;
         }
 
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 621e5586ab03..9b8eb54971ab 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -6,7 +6,6 @@
  *
  * Copyright Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index b3b9097c87c7..c11737f472d6 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -725,15 +725,17 @@ void nr_link_failed(ax25_cb *ax25, int reason)
         struct nr_node  *nr_node = NULL;
 
         spin_lock_bh(&nr_neigh_list_lock);
-        nr_neigh_for_each(s, node, &nr_neigh_list)
+        nr_neigh_for_each(s, node, &nr_neigh_list) {
                 if (s->ax25 == ax25) {
                         nr_neigh_hold(s);
                         nr_neigh = s;
                         break;
                 }
+        }
         spin_unlock_bh(&nr_neigh_list_lock);
 
-        if (nr_neigh == NULL) return;
+        if (nr_neigh == NULL)
+                return;
 
         nr_neigh->ax25 = NULL;
         ax25_cb_put(ax25);
@@ -743,11 +745,13 @@ void nr_link_failed(ax25_cb *ax25, int reason)
                 return;
         }
         spin_lock_bh(&nr_node_list_lock);
-        nr_node_for_each(nr_node, node, &nr_node_list)
+        nr_node_for_each(nr_node, node, &nr_node_list) {
                 nr_node_lock(nr_node);
-                if (nr_node->which < nr_node->count && nr_node->routes[nr_node->which].neighbour == nr_neigh)
+                if (nr_node->which < nr_node->count &&
+                    nr_node->routes[nr_node->which].neighbour == nr_neigh)
                         nr_node->which++;
                 nr_node_unlock(nr_node);
+        }
         spin_unlock_bh(&nr_node_list_lock);
         nr_neigh_put(nr_neigh);
 }
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index 75b72d389ba9..ddba1c144260 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -138,8 +138,8 @@ static void nr_heartbeat_expiry(unsigned long param)
                 if (sock_flag(sk, SOCK_DESTROY) ||
                     (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) {
                         sock_hold(sk);
-                        nr_destroy_socket(sk);
                         bh_unlock_sock(sk);
+                        nr_destroy_socket(sk);
                         sock_put(sk);
                         return;
                 }