This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / net / wan / cycx_x25.c

diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 5b48cd8..07bfe10 100644 (file)
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -92,8 +92,6 @@
 #include <linux/cyclomx.h>     /* Cyclom 2X common user API definitions */
 #include <linux/cycx_x25.h>    /* X.25 firmware API definitions */
 
-#include <net/x25device.h>
-
 /* Defines & Macros */
 #define CYCX_X25_MAX_CMD_RETRY 5
 #define CYCX_X25_CHAN_MTU 2048 /* unfragmented logical channel MTU */
@@ -233,7 +231,7 @@ int cycx_x25_wan_init(struct cycx_device *card, wandev_conf_t *conf)
        /* Initialize protocol-specific fields */
        card->mbox  = card->hw.dpmbase + X25_MBOX_OFFS;
        card->u.x.connection_keys = 0;
-       spin_lock_init(&card->u.x.lock);
+       card->u.x.lock = SPIN_LOCK_UNLOCKED;
 
        /* Configure adapter. Here we set reasonable defaults, then parse
         * device configuration structure and set configuration options.
@@ -1197,7 +1195,7 @@ static int x25_place_call(struct cycx_device *card,
             remotelen = strlen(chan->addr);
        u8 key;
 
-       if (card->u.x.connection_keys == ~0U) {
+       if (card->u.x.connection_keys == ~0UL) {
                printk(KERN_INFO "%s: too many simultaneous connection "
                                 "requests!\n", card->devname);
                return -EAGAIN;
@@ -1488,7 +1486,11 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event)
        ptr  = skb_put(skb, 1);
        *ptr = event;
 
-       skb->protocol = x25_type_trans(skb, dev);
+       skb->dev = dev;
+       skb->protocol = htons(ETH_P_X25);
+       skb->mac.raw = skb->data;
+       skb->pkt_type = PACKET_HOST;
+
        netif_rx(skb);
        dev->last_rx = jiffies;         /* timestamp */
 }