ide: Add tx4939ide driver (v6)

[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 0a760fe66843fa128858aa67c1959b4b39bb0f46..e4e1b6e495386c6cb1673a9e29143e1681bea6f6 100644 (file)
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -3,7 +3,7 @@
  *
  *     This is ALPHA test software. This code may break your machine,
  *     randomly fail to work with new releases, misbehave and/or generally
- *     screw up. It might even work. 
+ *     screw up. It might even work.
  *
  *     This code REQUIRES 2.1.15 or higher
  *
@@ -16,7 +16,7 @@
  *     History
  *     X.25 001        Jonathan Naylor   Started coding.
  *     X.25 002        Jonathan Naylor   New timer architecture.
- *     mar/20/00       Daniela Squassoni Disabling/enabling of facilities 
+ *     mar/20/00       Daniela Squassoni Disabling/enabling of facilities
  *                                       negotiation.
  *     2000-09-04      Henner Eisen      dev_hold() / dev_put() for x25_neigh.
  */
@@ -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);
@@ -94,7 +94,7 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
                               skb->data[3], skb->data[4],
                               skb->data[5], skb->data[6]);
                        break;
-                       
+
                default:
                        printk(KERN_WARNING "x25: received unknown %02X "
                               "with LCI 000\n", frametype);
@@ -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;