Staging: only build the tree if we really want to

[linux-2.6-omap-h63xx.git] / net / x25 / x25_link.c

diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index 741ce95d4ad156b65f12a5693776a20a60d91d03..e4e1b6e495386c6cb1673a9e29143e1681bea6f6 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -30,7 +30,7 @@
 #include <linux/init.h>
 #include <net/x25.h>
 
-static struct list_head x25_neigh_list = LIST_HEAD_INIT(x25_neigh_list);
+static LIST_HEAD(x25_neigh_list);
 static DEFINE_RWLOCK(x25_neigh_list_lock);
 
 static void x25_t20timer_expiry(unsigned long);
@@ -247,10 +247,7 @@ void x25_link_device_up(struct net_device *dev)
                return;
 
        skb_queue_head_init(&nb->queue);
-
-       init_timer(&nb->t20timer);
-       nb->t20timer.data     = (unsigned long)nb;
-       nb->t20timer.function = &x25_t20timer_expiry;
+       setup_timer(&nb->t20timer, x25_t20timer_expiry, (unsigned long)nb);
 
        dev_hold(dev);
        nb->dev      = dev;