VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 0394ee0..e44b189 100644 (file)
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -24,6 +24,7 @@
 #include <linux/tty.h>
 #include <linux/netdevice.h>
 #include <linux/poll.h>
+#include <linux/crc-ccitt.h>
 #include <linux/ppp_defs.h>
 #include <linux/if_ppp.h>
 #include <linux/ppp_channel.h>
@@ -207,7 +208,7 @@ ppp_asynctty_close(struct tty_struct *tty)
 
        write_lock_irq(&disc_data_lock);
        ap = tty->disc_data;
-       tty->disc_data = 0;
+       tty->disc_data = NULL;
        write_unlock_irq(&disc_data_lock);
        if (ap == 0)
                return;
@@ -238,7 +239,7 @@ ppp_asynctty_close(struct tty_struct *tty)
  */
 static ssize_t
 ppp_asynctty_read(struct tty_struct *tty, struct file *file,
-                 unsigned char *buf, size_t count)
+                 unsigned char __user *buf, size_t count)
 {
        return -EAGAIN;
 }
@@ -249,7 +250,7 @@ ppp_asynctty_read(struct tty_struct *tty, struct file *file,
  */
 static ssize_t
 ppp_asynctty_write(struct tty_struct *tty, struct file *file,
-                  const unsigned char *buf, size_t count)
+                  const unsigned char __user *buf, size_t count)
 {
        return -EAGAIN;
 }
@@ -260,6 +261,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
 {
        struct asyncppp *ap = ap_get(tty);
        int err, val;
+       int __user *p = (int __user *)arg;
 
        if (ap == 0)
                return -ENXIO;
@@ -270,7 +272,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
                if (ap == 0)
                        break;
                err = -EFAULT;
-               if (put_user(ppp_channel_index(&ap->chan), (int *) arg))
+               if (put_user(ppp_channel_index(&ap->chan), p))
                        break;
                err = 0;
                break;
@@ -280,7 +282,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
                if (ap == 0)
                        break;
                err = -EFAULT;
-               if (put_user(ppp_unit_number(&ap->chan), (int *) arg))
+               if (put_user(ppp_unit_number(&ap->chan), p))
                        break;
                err = 0;
                break;
@@ -299,7 +301,7 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
 
        case FIONREAD:
                val = 0;
-               if (put_user(val, (int *) arg))
+               if (put_user(val, p))
                        break;
                err = 0;
                break;
@@ -397,6 +399,8 @@ static int
 ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
 {
        struct asyncppp *ap = chan->private;
+       void __user *argp = (void __user *)arg;
+       int __user *p = argp;
        int err, val;
        u32 accm[8];
 
@@ -404,12 +408,12 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
        switch (cmd) {
        case PPPIOCGFLAGS:
                val = ap->flags | ap->rbits;
-               if (put_user(val, (int *) arg))
+               if (put_user(val, p))
                        break;
                err = 0;
                break;
        case PPPIOCSFLAGS:
-               if (get_user(val, (int *) arg))
+               if (get_user(val, p))
                        break;
                ap->flags = val & ~SC_RCV_BITS;
                spin_lock_irq(&ap->recv_lock);
@@ -419,34 +423,34 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
                break;
 
        case PPPIOCGASYNCMAP:
-               if (put_user(ap->xaccm[0], (u32 *) arg))
+               if (put_user(ap->xaccm[0], (u32 __user *)argp))
                        break;
                err = 0;
                break;
        case PPPIOCSASYNCMAP:
-               if (get_user(ap->xaccm[0], (u32 *) arg))
+               if (get_user(ap->xaccm[0], (u32 __user *)argp))
                        break;
                err = 0;
                break;
 
        case PPPIOCGRASYNCMAP:
-               if (put_user(ap->raccm, (u32 *) arg))
+               if (put_user(ap->raccm, (u32 __user *)argp))
                        break;
                err = 0;
                break;
        case PPPIOCSRASYNCMAP:
-               if (get_user(ap->raccm, (u32 *) arg))
+               if (get_user(ap->raccm, (u32 __user *)argp))
                        break;
                err = 0;
                break;
 
        case PPPIOCGXASYNCMAP:
-               if (copy_to_user((void __user *) arg, ap->xaccm, sizeof(ap->xaccm)))
+               if (copy_to_user(argp, ap->xaccm, sizeof(ap->xaccm)))
                        break;
                err = 0;
                break;
        case PPPIOCSXASYNCMAP:
-               if (copy_from_user(accm, (void __user *) arg, sizeof(accm)))
+               if (copy_from_user(accm, argp, sizeof(accm)))
                        break;
                accm[2] &= ~0x40000000U;        /* can't escape 0x5e */
                accm[3] |= 0x60000000U;         /* must escape 0x7d, 0x7e */
@@ -455,12 +459,12 @@ ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd, unsigned long arg)
                break;
 
        case PPPIOCGMRU:
-               if (put_user(ap->mru, (int *) arg))
+               if (put_user(ap->mru, p))
                        break;
                err = 0;
                break;
        case PPPIOCSMRU:
-               if (get_user(val, (int *) arg))
+               if (get_user(val, p))
                        break;
                if (val < PPP_MRU)
                        val = PPP_MRU;
@@ -501,43 +505,6 @@ static void ppp_async_process(unsigned long arg)
  * Procedures for encapsulation and framing.
  */
 
-u16 ppp_crc16_table[256] = {
-       0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
-       0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
-       0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
-       0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
-       0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
-       0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
-       0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
-       0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
-       0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
-       0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
-       0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
-       0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
-       0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
-       0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
-       0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
-       0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
-       0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
-       0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
-       0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
-       0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
-       0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
-       0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
-       0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
-       0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
-       0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
-       0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
-       0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
-       0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
-       0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
-       0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
-       0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
-       0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-};
-EXPORT_SYMBOL(ppp_crc16_table);
-#define fcstab ppp_crc16_table         /* for PPP_FCS macro */
-
 /*
  * Procedure to encode the data for async serial transmission.
  * Does octet stuffing (escaping), puts the address/control bytes
@@ -639,7 +606,7 @@ ppp_async_encode(struct asyncppp *ap)
        ap->olim = buf;
 
        kfree_skb(ap->tpkt);
-       ap->tpkt = 0;
+       ap->tpkt = NULL;
        return 1;
 }
 
@@ -738,7 +705,7 @@ flush:
        clear_bit(XMIT_BUSY, &ap->xmit_flags);
        if (ap->tpkt != 0) {
                kfree_skb(ap->tpkt);
-               ap->tpkt = 0;
+               ap->tpkt = NULL;
                clear_bit(XMIT_FULL, &ap->xmit_flags);
                done = 1;
        }
@@ -760,7 +727,7 @@ ppp_async_flush_output(struct asyncppp *ap)
        ap->optr = ap->olim;
        if (ap->tpkt != NULL) {
                kfree_skb(ap->tpkt);
-               ap->tpkt = 0;
+               ap->tpkt = NULL;
                clear_bit(XMIT_FULL, &ap->xmit_flags);
                done = 1;
        }
@@ -838,7 +805,7 @@ process_input_packet(struct asyncppp *ap)
        /* queue the frame to be processed */
        skb->cb[0] = ap->state;
        skb_queue_tail(&ap->rqueue, skb);
-       ap->rpkt = 0;
+       ap->rpkt = NULL;
        ap->state = 0;
        return;