13 files changed, 135 insertions, 135 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 6cabf6d8a751..42233df2b099 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1088,8 +1088,8 @@ out:
 /*
  *      FIXME: nonblock behaviour looks like it may have a bug.
  */
-static int ax25_connect(struct socket *sock, struct sockaddr *uaddr,
-        int addr_len, int flags)
+static int __must_check ax25_connect(struct socket *sock,
+        struct sockaddr *uaddr, int addr_len, int flags)
 {
         struct sock *sk = sock->sk;
         ax25_cb *ax25 = ax25_sk(sk), *ax25t;
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c
index 07ac0207eb69..aff3e652c2d1 100644
--- a/net/ax25/ax25_iface.c
+++ b/net/ax25/ax25_iface.c
@@ -29,17 +29,10 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 
-static struct protocol_struct {
-        struct protocol_struct *next;
-        unsigned int pid;
-        int (*func)(struct sk_buff *, ax25_cb *);
-} *protocol_list = NULL;
+static struct ax25_protocol *protocol_list;
 static DEFINE_RWLOCK(protocol_list_lock);
 
-static struct linkfail_struct {
-        struct linkfail_struct *next;
-        void (*func)(ax25_cb *, int);
-} *linkfail_list = NULL;
+static HLIST_HEAD(ax25_linkfail_list);
 static DEFINE_SPINLOCK(linkfail_lock);
 
 static struct listen_struct {
@@ -49,36 +42,23 @@ static struct listen_struct {
 } *listen_list = NULL;
 static DEFINE_SPINLOCK(listen_lock);
 
-int ax25_protocol_register(unsigned int pid,
-        int (*func)(struct sk_buff *, ax25_cb *))
+/*
+ * Do not register the internal protocols AX25_P_TEXT, AX25_P_SEGMENT,
+ * AX25_P_IP or AX25_P_ARP ...
+ */
+void ax25_register_pid(struct ax25_protocol *ap)
 {
-        struct protocol_struct *protocol;
-
-        if (pid == AX25_P_TEXT || pid == AX25_P_SEGMENT)
-                return 0;
-#ifdef CONFIG_INET
-        if (pid == AX25_P_IP || pid == AX25_P_ARP)
-                return 0;
-#endif
-        if ((protocol = kmalloc(sizeof(*protocol), GFP_ATOMIC)) == NULL)
-                return 0;
-
-        protocol->pid  = pid;
-        protocol->func = func;
-
         write_lock_bh(&protocol_list_lock);
-        protocol->next = protocol_list;
-        protocol_list  = protocol;
+        ap->next = protocol_list;
+        protocol_list = ap;
         write_unlock_bh(&protocol_list_lock);
-
-        return 1;
 }
 
-EXPORT_SYMBOL(ax25_protocol_register);
+EXPORT_SYMBOL_GPL(ax25_register_pid);
 
 void ax25_protocol_release(unsigned int pid)
 {
-        struct protocol_struct *s, *protocol;
+        struct ax25_protocol *s, *protocol;
 
         write_lock_bh(&protocol_list_lock);
         protocol = protocol_list;
@@ -110,54 +90,19 @@ void ax25_protocol_release(unsigned int pid)
 
 EXPORT_SYMBOL(ax25_protocol_release);
 
-int ax25_linkfail_register(void (*func)(ax25_cb *, int))
+void ax25_linkfail_register(struct ax25_linkfail *lf)
 {
-        struct linkfail_struct *linkfail;
-
-        if ((linkfail = kmalloc(sizeof(*linkfail), GFP_ATOMIC)) == NULL)
-                return 0;
-
-        linkfail->func = func;
-
         spin_lock_bh(&linkfail_lock);
-        linkfail->next = linkfail_list;
-        linkfail_list  = linkfail;
+        hlist_add_head(&lf->lf_node, &ax25_linkfail_list);
         spin_unlock_bh(&linkfail_lock);
-
-        return 1;
 }
 
 EXPORT_SYMBOL(ax25_linkfail_register);
 
-void ax25_linkfail_release(void (*func)(ax25_cb *, int))
+void ax25_linkfail_release(struct ax25_linkfail *lf)
 {
-        struct linkfail_struct *s, *linkfail;
-
         spin_lock_bh(&linkfail_lock);
-        linkfail = linkfail_list;
-        if (linkfail == NULL) {
-                spin_unlock_bh(&linkfail_lock);
-                return;
-        }
-
-        if (linkfail->func == func) {
-                linkfail_list = linkfail->next;
-                spin_unlock_bh(&linkfail_lock);
-                kfree(linkfail);
-                return;
-        }
-
-        while (linkfail != NULL && linkfail->next != NULL) {
-                if (linkfail->next->func == func) {
-                        s = linkfail->next;
-                        linkfail->next = linkfail->next->next;
-                        spin_unlock_bh(&linkfail_lock);
-                        kfree(s);
-                        return;
-                }
-
-                linkfail = linkfail->next;
-        }
+        hlist_del_init(&lf->lf_node);
         spin_unlock_bh(&linkfail_lock);
 }
 
@@ -171,7 +116,7 @@ int ax25_listen_register(ax25_address *callsign, struct net_device *dev)
                 return 0;
 
         if ((listen = kmalloc(sizeof(*listen), GFP_ATOMIC)) == NULL)
-                return 0;
+                return -ENOMEM;
 
         listen->callsign = *callsign;
         listen->dev      = dev;
@@ -181,7 +126,7 @@ int ax25_listen_register(ax25_address *callsign, struct net_device *dev)
         listen_list  = listen;
         spin_unlock_bh(&listen_lock);
 
-        return 1;
+        return 0;
 }
 
 EXPORT_SYMBOL(ax25_listen_register);
@@ -223,7 +168,7 @@ EXPORT_SYMBOL(ax25_listen_release);
 int (*ax25_protocol_function(unsigned int pid))(struct sk_buff *, ax25_cb *)
 {
         int (*res)(struct sk_buff *, ax25_cb *) = NULL;
-        struct protocol_struct *protocol;
+        struct ax25_protocol *protocol;
 
         read_lock(&protocol_list_lock);
         for (protocol = protocol_list; protocol != NULL; protocol = protocol->next)
@@ -242,7 +187,8 @@ int ax25_listen_mine(ax25_address *callsign, struct net_device *dev)
 
         spin_lock_bh(&listen_lock);
         for (listen = listen_list; listen != NULL; listen = listen->next)
-                if (ax25cmp(&listen->callsign, callsign) == 0 && (listen->dev == dev || listen->dev == NULL)) {
+                if (ax25cmp(&listen->callsign, callsign) == 0 &&
+                    (listen->dev == dev || listen->dev == NULL)) {
                         spin_unlock_bh(&listen_lock);
                         return 1;
         }
@@ -253,17 +199,18 @@ int ax25_listen_mine(ax25_address *callsign, struct net_device *dev)
 
 void ax25_link_failed(ax25_cb *ax25, int reason)
 {
-        struct linkfail_struct *linkfail;
+        struct ax25_linkfail *lf;
+        struct hlist_node *node;
 
         spin_lock_bh(&linkfail_lock);
-        for (linkfail = linkfail_list; linkfail != NULL; linkfail = linkfail->next)
-                (linkfail->func)(ax25, reason);
+        hlist_for_each_entry(lf, node, &ax25_linkfail_list, lf_node)
+                lf->func(ax25, reason);
         spin_unlock_bh(&linkfail_lock);
 }
 
 int ax25_protocol_is_registered(unsigned int pid)
 {
-        struct protocol_struct *protocol;
+        struct ax25_protocol *protocol;
         int res = 0;
 
         read_lock_bh(&protocol_list_lock);
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index 8580356ace5c..0a0381622b1c 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -71,7 +71,7 @@ void ax25_rt_device_down(struct net_device *dev)
         write_unlock(&ax25_route_lock);
 }
 
-static int ax25_rt_add(struct ax25_routes_struct *route)
+static int __must_check ax25_rt_add(struct ax25_routes_struct *route)
 {
         ax25_route *ax25_rt;
         ax25_dev *ax25_dev;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1aaff0a2e098..2daa0dc19d33 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1325,7 +1325,8 @@ void ip_rt_send_redirect(struct sk_buff *skb)
         /* Check for load limit; set rate_last to the latest sent
          * redirect.
          */
-        if (time_after(jiffies,
+        if (rt->u.dst.rate_tokens == 0 ||
+            time_after(jiffies,
                        (rt->u.dst.rate_last +
                         (ip_rt_redirect_load << rt->u.dst.rate_tokens)))) {
                 icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, rt->rt_gateway);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a1222d6968c4..bf7a22412bcb 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -928,6 +928,7 @@ int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)
                         if (tp->md5sig_info->entries4 == 0) {
                                 kfree(tp->md5sig_info->keys4);
                                 tp->md5sig_info->keys4 = NULL;
+                                tp->md5sig_info->alloced4 = 0;
                         } else if (tp->md5sig_info->entries4 != i) {
                                 /* Need to do some manipulation */
                                 memcpy(&tp->md5sig_info->keys4[i],
@@ -1185,7 +1186,7 @@ done_opts:
                 return 0;
 
         if (hash_expected && !hash_location) {
-                LIMIT_NETDEBUG(KERN_INFO "MD5 Hash NOT expected but found "
+                LIMIT_NETDEBUG(KERN_INFO "MD5 Hash expected but NOT found "
                                "(" NIPQUAD_FMT ", %d)->(" NIPQUAD_FMT ", %d)\n",
                                NIPQUAD(iph->saddr), ntohs(th->source),
                                NIPQUAD(iph->daddr), ntohs(th->dest));
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index fc3e5eb4bc3f..adcd6131df2a 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -7,7 +7,7 @@ menu "IPv6: Netfilter Configuration (EXPERIMENTAL)"
 
 config NF_CONNTRACK_IPV6
         tristate "IPv6 connection tracking support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && NF_CONNTRACK
+        depends on INET && IPV6 && EXPERIMENTAL && NF_CONNTRACK
         ---help---
           Connection tracking keeps a record of what packets have passed
           through your machine, in order to figure out how they are related
@@ -21,6 +21,7 @@ config NF_CONNTRACK_IPV6
 
 config IP6_NF_QUEUE
         tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"
+        depends on INET && IPV6 && NETFILTER && EXPERIMENTAL
         ---help---
 
           This option adds a queue handler to the kernel for IPv6
@@ -41,7 +42,7 @@ config IP6_NF_QUEUE
 
 config IP6_NF_IPTABLES
         tristate "IP6 tables support (required for filtering)"
-        depends on NETFILTER_XTABLES
+        depends on INET && IPV6 && EXPERIMENTAL && NETFILTER_XTABLES
         help
           ip6tables is a general, extensible packet identification framework.
           Currently only the packet filtering and packet mangling subsystem
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 1d50f801f181..43bbe2c9e49a 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1377,6 +1377,15 @@ static struct notifier_block nr_dev_notifier = {
 
 static struct net_device **dev_nr;
 
+static struct ax25_protocol nr_pid = {
+        .pid    = AX25_P_NETROM,
+        .func   = nr_route_frame
+};
+
+static struct ax25_linkfail nr_linkfail_notifier = {
+        .func   = nr_link_failed,
+};
+
 static int __init nr_proto_init(void)
 {
         int i;
@@ -1424,8 +1433,8 @@ static int __init nr_proto_init(void)
                 
         register_netdevice_notifier(&nr_dev_notifier);
 
-        ax25_protocol_register(AX25_P_NETROM, nr_route_frame);
-        ax25_linkfail_register(nr_link_failed);
+        ax25_register_pid(&nr_pid);
+        ax25_linkfail_register(&nr_linkfail_notifier);
 
 #ifdef CONFIG_SYSCTL
         nr_register_sysctl();
@@ -1474,7 +1483,7 @@ static void __exit nr_exit(void)
         nr_unregister_sysctl();
 #endif
 
-        ax25_linkfail_release(nr_link_failed);
+        ax25_linkfail_release(&nr_linkfail_notifier);
         ax25_protocol_release(AX25_P_NETROM);
 
         unregister_netdevice_notifier(&nr_dev_notifier);
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 9b8eb54971ab..4700d5225b78 100644
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -128,25 +128,37 @@ static int nr_header(struct sk_buff *skb, struct net_device *dev, unsigned short
         return -37;
 }
 
-static int nr_set_mac_address(struct net_device *dev, void *addr)
+static int __must_check nr_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr *sa = addr;
+        int err;
+
+        if (!memcmp(dev->dev_addr, sa->sa_data, dev->addr_len))
+                return 0;
+
+        if (dev->flags & IFF_UP) {
+                err = ax25_listen_register((ax25_address *)sa->sa_data, NULL);
+                if (err)
+                        return err;
 
-        if (dev->flags & IFF_UP)
                 ax25_listen_release((ax25_address *)dev->dev_addr, NULL);
+        }
 
         memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
 
-        if (dev->flags & IFF_UP)
-                ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
-
         return 0;
 }
 
 static int nr_open(struct net_device *dev)
 {
+        int err;
+
+        err = ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
+        if (err)
+                return err;
+
         netif_start_queue(dev);
-        ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
+
         return 0;
 }
 
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index 0096105bcd47..8f88964099ef 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -87,8 +87,9 @@ static void nr_remove_neigh(struct nr_neigh *);
  *      Add a new route to a node, and in the process add the node and the
  *      neighbour if it is new.
  */
-static int nr_add_node(ax25_address *nr, const char *mnemonic, ax25_address *ax25,
-        ax25_digi *ax25_digi, struct net_device *dev, int quality, int obs_count)
+static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic,
+        ax25_address *ax25, ax25_digi *ax25_digi, struct net_device *dev,
+        int quality, int obs_count)
 {
         struct nr_node  *nr_node;
         struct nr_neigh *nr_neigh;
@@ -406,7 +407,8 @@ static int nr_del_node(ax25_address *callsign, ax25_address *neighbour, struct n
 /*
  *      Lock a neighbour with a quality.
  */
-static int nr_add_neigh(ax25_address *callsign, ax25_digi *ax25_digi, struct net_device *dev, unsigned int quality)
+static int __must_check nr_add_neigh(ax25_address *callsign,
+        ax25_digi *ax25_digi, struct net_device *dev, unsigned int quality)
 {
         struct nr_neigh *nr_neigh;
 
@@ -777,9 +779,13 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
         nr_src  = (ax25_address *)(skb->data + 0);
         nr_dest = (ax25_address *)(skb->data + 7);
 
-        if (ax25 != NULL)
-                nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat,
-                            ax25->ax25_dev->dev, 0, sysctl_netrom_obsolescence_count_initialiser);
+        if (ax25 != NULL) {
+                ret = nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat,
+                                  ax25->ax25_dev->dev, 0,
+                                  sysctl_netrom_obsolescence_count_initialiser);
+                if (ret)
+                        return ret;
+        }
 
         if ((dev = nr_dev_get(nr_dest)) != NULL) {      /* Its for me */
                 if (ax25 == NULL)                       /* Its from me */
@@ -844,6 +850,7 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25)
         ret = (nr_neigh->ax25 != NULL);
         nr_node_unlock(nr_node);
         nr_node_put(nr_node);
+
         return ret;
 }
 
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);