vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / slip.c

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 0c1995b..4ce52f5 100644 (file)
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -57,10 +57,11 @@
 #define SL_CHECK_TRANSMIT
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -85,8 +86,8 @@
 
 static struct net_device **slip_devs;
 
-int slip_maxdev = SL_NRUNIT;           /* Can be overridden with insmod! */
-MODULE_PARM(slip_maxdev, "i");
+static int slip_maxdev = SL_NRUNIT;
+module_param(slip_maxdev, int, 0);
 MODULE_PARM_DESC(slip_maxdev, "Maximum number of slip devices");
 
 static int slip_esc(unsigned char *p, unsigned char *d, int len);
@@ -417,7 +418,7 @@ sl_encaps(struct slip *sl, unsigned char *icp, int len)
         *       14 Oct 1994  Dmitry Gorodchanin.
         */
        sl->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
-       actual = sl->tty->driver->write(sl->tty, 0, sl->xbuff, count);
+       actual = sl->tty->driver->write(sl->tty, sl->xbuff, count);
 #ifdef SL_CHECK_TRANSMIT
        sl->dev->trans_start = jiffies;
 #endif
@@ -451,20 +452,18 @@ static void slip_write_wakeup(struct tty_struct *tty)
                return;
        }
 
-       actual = tty->driver->write(tty, 0, sl->xhead, sl->xleft);
+       actual = tty->driver->write(tty, sl->xhead, sl->xleft);
        sl->xleft -= actual;
        sl->xhead += actual;
 }
 
 static void sl_tx_timeout(struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        spin_lock(&sl->lock);
 
        if (netif_queue_stopped(dev)) {
-               struct slip *sl = (struct slip*)(dev->priv);
-
                if (!netif_running(dev))
                        goto out;
 
@@ -494,7 +493,7 @@ out:
 static int
 sl_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        spin_lock(&sl->lock);
        if (!netif_running(dev))  {
@@ -528,7 +527,7 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev)
 static int
 sl_close(struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        spin_lock_bh(&sl->lock);
        if (sl->tty) {
@@ -547,7 +546,7 @@ sl_close(struct net_device *dev)
 
 static int sl_open(struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        if (sl->tty==NULL)
                return -ENODEV;
@@ -561,7 +560,7 @@ static int sl_open(struct net_device *dev)
 
 static int sl_change_mtu(struct net_device *dev, int new_mtu)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        if (new_mtu < 68 || new_mtu > 65534)
                return -EINVAL;
@@ -577,7 +576,7 @@ static struct net_device_stats *
 sl_get_stats(struct net_device *dev)
 {
        static struct net_device_stats stats;
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 #ifdef SL_INCLUDE_CSLIP
        struct slcompress *comp;
 #endif
@@ -612,7 +611,7 @@ sl_get_stats(struct net_device *dev)
 
 static int sl_init(struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        /*
         *      Finish setting up the DEVICE info. 
@@ -630,7 +629,7 @@ static int sl_init(struct net_device *dev)
 
 static void sl_uninit(struct net_device *dev)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
 
        sl_free_bufs(sl);
 }
@@ -719,7 +718,7 @@ static void sl_sync(void)
                if ((dev = slip_devs[i]) == NULL)
                        break;
 
-               sl = dev->priv;
+               sl = netdev_priv(dev);
                if (sl->tty || sl->leased)
                        continue;
                if (dev->flags&IFF_UP)
@@ -746,7 +745,7 @@ sl_alloc(dev_t line)
                if (dev == NULL)
                        break;
 
-               sl = dev->priv;
+               sl = netdev_priv(dev);
                if (sl->leased) {
                        if (sl->line != line)
                                continue;
@@ -788,7 +787,7 @@ sl_alloc(dev_t line)
                i = sel;
                dev = slip_devs[i];
                if (score > 1) {
-                       sl = dev->priv;
+                       sl = netdev_priv(dev);
                        sl->flags &= (1 << SLF_INUSE);
                        return sl;
                }
@@ -799,7 +798,7 @@ sl_alloc(dev_t line)
                return NULL;
 
        if (dev) {
-               sl = dev->priv;
+               sl = netdev_priv(dev);
                if (test_bit(SLF_INUSE, &sl->flags)) {
                        unregister_netdevice(dev);
                        dev = NULL;
@@ -817,7 +816,7 @@ sl_alloc(dev_t line)
                dev->base_addr  = i;
        }
 
-       sl = dev->priv;
+       sl = netdev_priv(dev);
 
        /* Initialize channel control data */
        sl->magic       = SLIP_MAGIC;
@@ -1260,7 +1259,7 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
 
 static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
 {
-       struct slip *sl = (struct slip*)(dev->priv);
+       struct slip *sl = netdev_priv(dev);
        unsigned long *p = (unsigned long *)&rq->ifr_ifru;
 
        if (sl == NULL)         /* Allocation failed ?? */
@@ -1406,7 +1405,7 @@ static void __exit slip_exit(void)
                        dev = slip_devs[i];
                        if (!dev)
                                continue;
-                       sl = dev->priv;
+                       sl = netdev_priv(dev);
                        spin_lock_bh(&sl->lock);
                        if (sl->tty) {
                                busy++;
@@ -1423,7 +1422,7 @@ static void __exit slip_exit(void)
                        continue;
                slip_devs[i] = NULL;
 
-               sl = dev->priv;
+               sl = netdev_priv(dev);
                if (sl->tty) {
                        printk(KERN_ERR "%s: tty discipline still running\n",
                               dev->name);
@@ -1475,7 +1474,7 @@ static void sl_outfill(unsigned long sls)
                        if (!netif_queue_stopped(sl->dev))
                        {
                                /* if device busy no outfill */
-                               sl->tty->driver->write(sl->tty, 0, &s, 1);
+                               sl->tty->driver->write(sl->tty, &s, 1);
                        }
                }
                else