4 files changed, 57 insertions, 35 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 08a542855654..9e279464c9d1 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1314,7 +1314,8 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 if (copy_from_user(&rose_callsign, argp, sizeof(ax25_address)))
                         return -EFAULT;
                 if (ax25cmp(&rose_callsign, &null_ax25_address) != 0)
-                        ax25_listen_register(&rose_callsign, NULL);
+                        return ax25_listen_register(&rose_callsign, NULL);
+
                 return 0;
 
         case SIOCRSGL2CALL:
@@ -1481,6 +1482,15 @@ static struct notifier_block rose_dev_notifier = {
 
 static struct net_device **dev_rose;
 
+static struct ax25_protocol rose_pid = {
+        .pid    = AX25_P_ROSE,
+        .func   = rose_route_frame
+};
+
+static struct ax25_linkfail rose_linkfail_notifier = {
+        .func   = rose_link_failed
+};
+
 static int __init rose_proto_init(void)
 {
         int i;
@@ -1530,8 +1540,8 @@ static int __init rose_proto_init(void)
         sock_register(&rose_family_ops);
         register_netdevice_notifier(&rose_dev_notifier);
 
-        ax25_protocol_register(AX25_P_ROSE, rose_route_frame);
-        ax25_linkfail_register(rose_link_failed);
+        ax25_register_pid(&rose_pid);
+        ax25_linkfail_register(&rose_linkfail_notifier);
 
 #ifdef CONFIG_SYSCTL
         rose_register_sysctl();
@@ -1579,7 +1589,7 @@ static void __exit rose_exit(void)
         rose_rt_free();
 
         ax25_protocol_release(AX25_P_ROSE);
-        ax25_linkfail_release(rose_link_failed);
+        ax25_linkfail_release(&rose_linkfail_notifier);
 
         if (ax25cmp(&rose_callsign, &null_ax25_address) != 0)
                 ax25_listen_release(&rose_callsign, NULL);
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 7c279e2659ec..50824d345fa6 100644
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -93,20 +93,34 @@ static int rose_rebuild_header(struct sk_buff *skb)
 static int rose_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr *sa = addr;
+        int err;
 
-        rose_del_loopback_node((rose_address *)dev->dev_addr);
+        if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
+                return 0;
 
-        memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
+        if (dev->flags & IFF_UP) {
+                err = rose_add_loopback_node((rose_address *)dev->dev_addr);
+                if (err)
+                        return err;
+
+                rose_del_loopback_node((rose_address *)dev->dev_addr);
+        }
 
-        rose_add_loopback_node((rose_address *)dev->dev_addr);
+        memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
 
         return 0;
 }
 
 static int rose_open(struct net_device *dev)
 {
+        int err;
+
+        err = rose_add_loopback_node((rose_address *)dev->dev_addr);
+        if (err)
+                return err;
+
         netif_start_queue(dev);
-        rose_add_loopback_node((rose_address *)dev->dev_addr);
+
         return 0;
 }
 
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c
index 103b4d38f88a..3e41bd93ab9f 100644
--- a/net/rose/rose_loopback.c
+++ b/net/rose/rose_loopback.c
@@ -79,7 +79,8 @@ static void rose_loopback_timer(unsigned long param)
 
                 skb->h.raw = skb->data;
 
-                if ((sk = rose_find_socket(lci_o, rose_loopback_neigh)) != NULL) {
+                sk = rose_find_socket(lci_o, &rose_loopback_neigh);
+                if (sk) {
                         if (rose_process_rx_frame(sk, skb) == 0)
                                 kfree_skb(skb);
                         continue;
@@ -87,7 +88,7 @@ static void rose_loopback_timer(unsigned long param)
 
                 if (frametype == ROSE_CALL_REQUEST) {
                         if ((dev = rose_dev_get(dest)) != NULL) {
-                                if (rose_rx_call_request(skb, dev, rose_loopback_neigh, lci_o) == 0)
+                                if (rose_rx_call_request(skb, dev, &rose_loopback_neigh, lci_o) == 0)
                                         kfree_skb(skb);
                         } else {
                                 kfree_skb(skb);
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 7252344779a0..8028c0d425dc 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -46,13 +46,13 @@ static DEFINE_SPINLOCK(rose_neigh_list_lock);
 static struct rose_route *rose_route_list;
 static DEFINE_SPINLOCK(rose_route_list_lock);
 
-struct rose_neigh *rose_loopback_neigh;
+struct rose_neigh rose_loopback_neigh;
 
 /*
  *      Add a new route to a node, and in the process add the node and the
  *      neighbour if it is new.
  */
-static int rose_add_node(struct rose_route_struct *rose_route,
+static int __must_check rose_add_node(struct rose_route_struct *rose_route,
         struct net_device *dev)
 {
         struct rose_node  *rose_node, *rose_tmpn, *rose_tmpp;
@@ -361,33 +361,30 @@ out:
 /*
  *      Add the loopback neighbour.
  */
-int rose_add_loopback_neigh(void)
+void rose_add_loopback_neigh(void)
 {
-        if ((rose_loopback_neigh = kmalloc(sizeof(struct rose_neigh), GFP_ATOMIC)) == NULL)
-                return -ENOMEM;
+        struct rose_neigh *sn = &rose_loopback_neigh;
 
-        rose_loopback_neigh->callsign  = null_ax25_address;
-        rose_loopback_neigh->digipeat  = NULL;
-        rose_loopback_neigh->ax25      = NULL;
-        rose_loopback_neigh->dev       = NULL;
-        rose_loopback_neigh->count     = 0;
-        rose_loopback_neigh->use       = 0;
-        rose_loopback_neigh->dce_mode  = 1;
-        rose_loopback_neigh->loopback  = 1;
-        rose_loopback_neigh->number    = rose_neigh_no++;
-        rose_loopback_neigh->restarted = 1;
+        sn->callsign  = null_ax25_address;
+        sn->digipeat  = NULL;
+        sn->ax25      = NULL;
+        sn->dev       = NULL;
+        sn->count     = 0;
+        sn->use       = 0;
+        sn->dce_mode  = 1;
+        sn->loopback  = 1;
+        sn->number    = rose_neigh_no++;
+        sn->restarted = 1;
 
-        skb_queue_head_init(&rose_loopback_neigh->queue);
+        skb_queue_head_init(&sn->queue);
 
-        init_timer(&rose_loopback_neigh->ftimer);
-        init_timer(&rose_loopback_neigh->t0timer);
+        init_timer(&sn->ftimer);
+        init_timer(&sn->t0timer);
 
         spin_lock_bh(&rose_neigh_list_lock);
-        rose_loopback_neigh->next = rose_neigh_list;
-        rose_neigh_list           = rose_loopback_neigh;
+        sn->next = rose_neigh_list;
+        rose_neigh_list           = sn;
         spin_unlock_bh(&rose_neigh_list_lock);
-
-        return 0;
 }
 
 /*
@@ -421,13 +418,13 @@ int rose_add_loopback_node(rose_address *address)
         rose_node->mask         = 10;
         rose_node->count        = 1;
         rose_node->loopback     = 1;
-        rose_node->neighbour[0] = rose_loopback_neigh;
+        rose_node->neighbour[0] = &rose_loopback_neigh;
 
         /* Insert at the head of list. Address is always mask=10 */
         rose_node->next = rose_node_list;
         rose_node_list  = rose_node;
 
-        rose_loopback_neigh->count++;
+        rose_loopback_neigh.count++;
 
 out:
         spin_unlock_bh(&rose_node_list_lock);
@@ -458,7 +455,7 @@ void rose_del_loopback_node(rose_address *address)
 
         rose_remove_node(rose_node);
 
-        rose_loopback_neigh->count--;
+        rose_loopback_neigh.count--;
 
 out:
         spin_unlock_bh(&rose_node_list_lock);