leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slip: Drag kicking and screaming into coding style compliance

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan Cox 2007-11-19 15:03:38 +00:00 committed by David S. Miller
parent a35f5de776
commit 9ce6cf2553
1 changed files with 178 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

367
drivers/net/slip.c
View File

@ -11,9 +11,11 @@
* Fixes: * Fixes:
* Alan Cox : Sanity checks and avoid tx overruns. * Alan Cox : Sanity checks and avoid tx overruns.
* Has a new sl->mtu field. * Has a new sl->mtu field.
* Alan Cox : Found cause of overrun. ifconfig sl0 mtu upwards. * Alan Cox : Found cause of overrun. ifconfig sl0
* Driver now spots this and grows/shrinks its buffers(hack!). * mtu upwards. Driver now spots this
* Memory leak if you run out of memory setting up a slip driver fixed. * and grows/shrinks its buffers(hack!).
* Memory leak if you run out of memory
* setting up a slip driver fixed.
* Matt Dillon : Printable slip (borrowed from NET2E) * Matt Dillon : Printable slip (borrowed from NET2E)
* Pauline Middelink : Slip driver fixes. * Pauline Middelink : Slip driver fixes.
* Alan Cox : Honours the old SL_COMPRESSED flag * Alan Cox : Honours the old SL_COMPRESSED flag
@ -29,7 +31,8 @@
* buffering from 4096 to 256 bytes. * buffering from 4096 to 256 bytes.
* Improving SLIP response time. * Improving SLIP response time.
* CONFIG_SLIP_MODE_SLIP6. * CONFIG_SLIP_MODE_SLIP6.
* ifconfig sl? up & down now works correctly. * ifconfig sl? up & down now works
* correctly.
* Modularization. * Modularization.
* Alan Cox : Oops - fix AX.25 buffer lengths * Alan Cox : Oops - fix AX.25 buffer lengths
* Dmitry Gorodchanin : Even more cleanups. Preserve CSLIP * Dmitry Gorodchanin : Even more cleanups. Preserve CSLIP
@ -43,15 +46,18 @@
* device entries, just reg./unreg. them * device entries, just reg./unreg. them
* as they are needed. We kfree() them * as they are needed. We kfree() them
* at module cleanup. * at module cleanup.
* With MODULE-loading ``insmod'', user can * With MODULE-loading ``insmod'', user
* issue parameter: slip_maxdev=1024 * can issue parameter: slip_maxdev=1024
* (Or how much he/she wants.. Default is 256) * (Or how much he/she wants.. Default
* * Stanislav Voronyi : Slip line checking, with ideas taken * is 256)
* from multislip BSDI driver which was written * Stanislav Voronyi : Slip line checking, with ideas taken
* by Igor Chechik, RELCOM Corp. Only algorithms * from multislip BSDI driver which was
* have been ported to Linux SLIP driver. * written by Igor Chechik, RELCOM Corp.
* Only algorithms have been ported to
* Linux SLIP driver.
* Vitaly E. Lavrov : Sane behaviour on tty hangup. * Vitaly E. Lavrov : Sane behaviour on tty hangup.
* Alexey Kuznetsov : Cleanup interfaces to tty&netdevice modules. * Alexey Kuznetsov : Cleanup interfaces to tty & netdevice
* modules.
*/ */
#define SL_CHECK_TRANSMIT #define SL_CHECK_TRANSMIT
@ -99,7 +105,7 @@ static void slip_unesc6(struct slip *sl, unsigned char c);
#ifdef CONFIG_SLIP_SMART #ifdef CONFIG_SLIP_SMART
static void sl_keepalive(unsigned long sls); static void sl_keepalive(unsigned long sls);
static void sl_outfill(unsigned long sls); static void sl_outfill(unsigned long sls);
static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd); static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
#endif #endif
/******************************** /********************************
@ -117,15 +123,14 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd);
Allocate channel buffers. Allocate channel buffers.
*/ */
static int static int sl_alloc_bufs(struct slip *sl, int mtu)
sl_alloc_bufs(struct slip *sl, int mtu)
{ {
int err = -ENOBUFS; int err = -ENOBUFS;
unsigned long len; unsigned long len;
char * rbuff = NULL; char *rbuff = NULL;
char * xbuff = NULL; char *xbuff = NULL;
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
char * cbuff = NULL; char *cbuff = NULL;
struct slcompress *slcomp = NULL; struct slcompress *slcomp = NULL;
#endif #endif
@ -195,8 +200,7 @@ err_exit:
} }
/* Free a SLIP channel buffers. */ /* Free a SLIP channel buffers. */
static void static void sl_free_bufs(struct slip *sl)
sl_free_bufs(struct slip *sl)
{ {
/* Free all SLIP frame buffers. */ /* Free all SLIP frame buffers. */
kfree(xchg(&sl->rbuff, NULL)); kfree(xchg(&sl->rbuff, NULL));
@ -248,7 +252,6 @@ static int sl_realloc_bufs(struct slip *sl, int mtu)
} }
goto done; goto done;
} }
spin_lock_bh(&sl->lock); spin_lock_bh(&sl->lock);
err = -ENODEV; err = -ENODEV;
@ -298,23 +301,20 @@ done:
/* Set the "sending" flag. This must be atomic hence the set_bit. */ /* Set the "sending" flag. This must be atomic hence the set_bit. */
static inline void static inline void sl_lock(struct slip *sl)
sl_lock(struct slip *sl)
{ {
netif_stop_queue(sl->dev); netif_stop_queue(sl->dev);
} }
/* Clear the "sending" flag. This must be atomic, hence the ASM. */ /* Clear the "sending" flag. This must be atomic, hence the ASM. */
static inline void static inline void sl_unlock(struct slip *sl)
sl_unlock(struct slip *sl)
{ {
netif_wake_queue(sl->dev); netif_wake_queue(sl->dev);
} }
/* Send one completely decapsulated IP datagram to the IP layer. */ /* Send one completely decapsulated IP datagram to the IP layer. */
static void static void sl_bump(struct slip *sl)
sl_bump(struct slip *sl)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int count; int count;
@ -322,22 +322,22 @@ sl_bump(struct slip *sl)
count = sl->rcount; count = sl->rcount;
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
if (sl->mode & (SL_MODE_ADAPTIVE | SL_MODE_CSLIP)) { if (sl->mode & (SL_MODE_ADAPTIVE | SL_MODE_CSLIP)) {
unsigned char c; unsigned char c = sl->rbuff[0];
if ((c = sl->rbuff[0]) & SL_TYPE_COMPRESSED_TCP) { if (c & SL_TYPE_COMPRESSED_TCP) {
/* ignore compressed packets when CSLIP is off */ /* ignore compressed packets when CSLIP is off */
if (!(sl->mode & SL_MODE_CSLIP)) { if (!(sl->mode & SL_MODE_CSLIP)) {
printk(KERN_WARNING "%s: compressed packet ignored\n", sl->dev->name); printk(KERN_WARNING "%s: compressed packet ignored\n", sl->dev->name);
return; return;
} }
/* make sure we've reserved enough space for uncompress to use */ /* make sure we've reserved enough space for uncompress
to use */
if (count + 80 > sl->buffsize) { if (count + 80 > sl->buffsize) {
sl->rx_over_errors++; sl->rx_over_errors++;
return; return;
} }
count = slhc_uncompress(sl->slcomp, sl->rbuff, count); count = slhc_uncompress(sl->slcomp, sl->rbuff, count);
if (count <= 0) { if (count <= 0)
return; return;
}
} else if (c >= SL_TYPE_UNCOMPRESSED_TCP) { } else if (c >= SL_TYPE_UNCOMPRESSED_TCP) {
if (!(sl->mode & SL_MODE_CSLIP)) { if (!(sl->mode & SL_MODE_CSLIP)) {
/* turn on header compression */ /* turn on header compression */
@ -346,33 +346,31 @@ sl_bump(struct slip *sl)
printk(KERN_INFO "%s: header compression turned on\n", sl->dev->name); printk(KERN_INFO "%s: header compression turned on\n", sl->dev->name);
} }
sl->rbuff[0] &= 0x4f; sl->rbuff[0] &= 0x4f;
if (slhc_remember(sl->slcomp, sl->rbuff, count) <= 0) { if (slhc_remember(sl->slcomp, sl->rbuff, count) <= 0)
return; return;
}
} }
} }
#endif /* SL_INCLUDE_CSLIP */ #endif /* SL_INCLUDE_CSLIP */
sl->rx_bytes+=count; sl->rx_bytes += count;
skb = dev_alloc_skb(count); skb = dev_alloc_skb(count);
if (skb == NULL) { if (skb == NULL) {
printk(KERN_WARNING "%s: memory squeeze, dropping packet.\n", sl->dev->name); printk(KERN_WARNING "%s: memory squeeze, dropping packet.\n", sl->dev->name);
sl->rx_dropped++; sl->rx_dropped++;
return; return;
} }
skb->dev = sl->dev; skb->dev = sl->dev;
memcpy(skb_put(skb,count), sl->rbuff, count); memcpy(skb_put(skb, count), sl->rbuff, count);
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb->protocol=htons(ETH_P_IP); skb->protocol = htons(ETH_P_IP);
netif_rx(skb); netif_rx(skb);
sl->dev->last_rx = jiffies; sl->dev->last_rx = jiffies;
sl->rx_packets++; sl->rx_packets++;
} }
/* Encapsulate one IP datagram and stuff into a TTY queue. */ /* Encapsulate one IP datagram and stuff into a TTY queue. */
static void static void sl_encaps(struct slip *sl, unsigned char *icp, int len)
sl_encaps(struct slip *sl, unsigned char *icp, int len)
{ {
unsigned char *p; unsigned char *p;
int actual, count; int actual, count;
@ -386,12 +384,11 @@ sl_encaps(struct slip *sl, unsigned char *icp, int len)
p = icp; p = icp;
#ifdef SL_INCLUDE_CSLIP #ifdef SL_INCLUDE_CSLIP
if (sl->mode & SL_MODE_CSLIP) { if (sl->mode & SL_MODE_CSLIP)
len = slhc_compress(sl->slcomp, p, len, sl->cbuff, &p, 1); len = slhc_compress(sl->slcomp, p, len, sl->cbuff, &p, 1);
}
#endif #endif
#ifdef CONFIG_SLIP_MODE_SLIP6 #ifdef CONFIG_SLIP_MODE_SLIP6
if(sl->mode & SL_MODE_SLIP6) if (sl->mode & SL_MODE_SLIP6)
count = slip_esc6(p, (unsigned char *) sl->xbuff, len); count = slip_esc6(p, (unsigned char *) sl->xbuff, len);
else else
#endif #endif
@ -425,12 +422,12 @@ sl_encaps(struct slip *sl, unsigned char *icp, int len)
static void slip_write_wakeup(struct tty_struct *tty) static void slip_write_wakeup(struct tty_struct *tty)
{ {
int actual; int actual;
struct slip *sl = (struct slip *) tty->disc_data; struct slip *sl = tty->disc_data;
/* First make sure we're connected. */ /* First make sure we're connected. */
if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev)) { if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev))
return; return;
}
if (sl->xleft <= 0) { if (sl->xleft <= 0) {
/* Now serial buffer is almost free & we can start /* Now serial buffer is almost free & we can start
* transmission of another packet */ * transmission of another packet */
@ -463,15 +460,15 @@ static void sl_tx_timeout(struct net_device *dev)
/* 20 sec timeout not reached */ /* 20 sec timeout not reached */
goto out; goto out;
} }
printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name, printk(KERN_WARNING "%s: transmit timed out, %s?\n",
(sl->tty->driver->chars_in_buffer(sl->tty) || sl->xleft) ? dev->name,
"bad line quality" : "driver error"); (sl->tty->driver->chars_in_buffer(sl->tty) || sl->xleft) ?
"bad line quality" : "driver error");
sl->xleft = 0; sl->xleft = 0;
sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP); sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
sl_unlock(sl); sl_unlock(sl);
#endif #endif
} }
out: out:
spin_unlock(&sl->lock); spin_unlock(&sl->lock);
} }
@ -484,7 +481,7 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev)
struct slip *sl = netdev_priv(dev); struct slip *sl = netdev_priv(dev);
spin_lock(&sl->lock); spin_lock(&sl->lock);
if (!netif_running(dev)) { if (!netif_running(dev)) {
spin_unlock(&sl->lock); spin_unlock(&sl->lock);
printk(KERN_WARNING "%s: xmit call when iface is down\n", dev->name); printk(KERN_WARNING "%s: xmit call when iface is down\n", dev->name);
dev_kfree_skb(skb); dev_kfree_skb(skb);
@ -497,7 +494,7 @@ sl_xmit(struct sk_buff *skb, struct net_device *dev)
} }
sl_lock(sl); sl_lock(sl);
sl->tx_bytes+=skb->len; sl->tx_bytes += skb->len;
sl_encaps(sl, skb->data, skb->len); sl_encaps(sl, skb->data, skb->len);
spin_unlock(&sl->lock); spin_unlock(&sl->lock);
@ -536,7 +533,7 @@ static int sl_open(struct net_device *dev)
{ {
struct slip *sl = netdev_priv(dev); struct slip *sl = netdev_priv(dev);
if (sl->tty==NULL) if (sl->tty == NULL)
return -ENODEV; return -ENODEV;
sl->flags &= (1 << SLF_INUSE); sl->flags &= (1 << SLF_INUSE);
@ -657,20 +654,19 @@ static void sl_setup(struct net_device *dev)
* in parallel * in parallel
*/ */
static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp,
char *fp, int count)
{ {
struct slip *sl = (struct slip *) tty->disc_data; struct slip *sl = tty->disc_data;
if (!sl || sl->magic != SLIP_MAGIC || if (!sl || sl->magic != SLIP_MAGIC || !netif_running(sl->dev))
!netif_running(sl->dev))
return; return;
/* Read the characters out of the buffer */ /* Read the characters out of the buffer */
while (count--) { while (count--) {
if (fp && *fp++) { if (fp && *fp++) {
if (!test_and_set_bit(SLF_ERROR, &sl->flags)) { if (!test_and_set_bit(SLF_ERROR, &sl->flags))
sl->rx_errors++; sl->rx_errors++;
}
cp++; cp++;
continue; continue;
} }
@ -688,7 +684,6 @@ static void slip_receive_buf(struct tty_struct *tty, const unsigned char *cp, ch
************************************/ ************************************/
/* Collect hanged up channels */ /* Collect hanged up channels */
static void sl_sync(void) static void sl_sync(void)
{ {
int i; int i;
@ -696,21 +691,21 @@ static void sl_sync(void)
struct slip *sl; struct slip *sl;
for (i = 0; i < slip_maxdev; i++) { for (i = 0; i < slip_maxdev; i++) {
if ((dev = slip_devs[i]) == NULL) dev = slip_devs[i];
if (dev == NULL)
break; break;
sl = netdev_priv(dev); sl = netdev_priv(dev);
if (sl->tty || sl->leased) if (sl->tty || sl->leased)
continue; continue;
if (dev->flags&IFF_UP) if (dev->flags & IFF_UP)
dev_close(dev); dev_close(dev);
} }
} }
/* Find a free SLIP channel, and link in this `tty' line. */ /* Find a free SLIP channel, and link in this `tty' line. */
static struct slip * static struct slip *sl_alloc(dev_t line)
sl_alloc(dev_t line)
{ {
int i; int i;
int sel = -1; int sel = -1;
@ -805,15 +800,15 @@ sl_alloc(dev_t line)
spin_lock_init(&sl->lock); spin_lock_init(&sl->lock);
sl->mode = SL_MODE_DEFAULT; sl->mode = SL_MODE_DEFAULT;
#ifdef CONFIG_SLIP_SMART #ifdef CONFIG_SLIP_SMART
init_timer(&sl->keepalive_timer); /* initialize timer_list struct */ /* initialize timer_list struct */
sl->keepalive_timer.data=(unsigned long)sl; init_timer(&sl->keepalive_timer);
sl->keepalive_timer.function=sl_keepalive; sl->keepalive_timer.data = (unsigned long)sl;
sl->keepalive_timer.function = sl_keepalive;
init_timer(&sl->outfill_timer); init_timer(&sl->outfill_timer);
sl->outfill_timer.data=(unsigned long)sl; sl->outfill_timer.data = (unsigned long)sl;
sl->outfill_timer.function=sl_outfill; sl->outfill_timer.function = sl_outfill;
#endif #endif
slip_devs[i] = dev; slip_devs[i] = dev;
return sl; return sl;
} }
@ -832,7 +827,7 @@ static int slip_open(struct tty_struct *tty)
struct slip *sl; struct slip *sl;
int err; int err;
if(!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
return -EPERM; return -EPERM;
/* RTnetlink lock is misused here to serialize concurrent /* RTnetlink lock is misused here to serialize concurrent
@ -844,7 +839,7 @@ static int slip_open(struct tty_struct *tty)
/* Collect hanged up channels. */ /* Collect hanged up channels. */
sl_sync(); sl_sync();
sl = (struct slip *) tty->disc_data; sl = tty->disc_data;
err = -EEXIST; err = -EEXIST;
/* First make sure we're not already connected. */ /* First make sure we're not already connected. */
@ -853,7 +848,8 @@ static int slip_open(struct tty_struct *tty)
/* OK. Find a free SLIP channel to use. */ /* OK. Find a free SLIP channel to use. */
err = -ENFILE; err = -ENFILE;
if ((sl = sl_alloc(tty_devnum(tty))) == NULL) sl = sl_alloc(tty_devnum(tty));
if (sl == NULL)
goto err_exit; goto err_exit;
sl->tty = tty; sl->tty = tty;
@ -863,23 +859,25 @@ static int slip_open(struct tty_struct *tty)
if (!test_bit(SLF_INUSE, &sl->flags)) { if (!test_bit(SLF_INUSE, &sl->flags)) {
/* Perform the low-level SLIP initialization. */ /* Perform the low-level SLIP initialization. */
if ((err = sl_alloc_bufs(sl, SL_MTU)) != 0) err = sl_alloc_bufs(sl, SL_MTU);
if (err)
goto err_free_chan; goto err_free_chan;
set_bit(SLF_INUSE, &sl->flags); set_bit(SLF_INUSE, &sl->flags);
if ((err = register_netdevice(sl->dev))) err = register_netdevice(sl->dev);
if (err)
goto err_free_bufs; goto err_free_bufs;
} }
#ifdef CONFIG_SLIP_SMART #ifdef CONFIG_SLIP_SMART
if (sl->keepalive) { if (sl->keepalive) {
sl->keepalive_timer.expires=jiffies+sl->keepalive*HZ; sl->keepalive_timer.expires = jiffies + sl->keepalive * HZ;
add_timer (&sl->keepalive_timer); add_timer(&sl->keepalive_timer);
} }
if (sl->outfill) { if (sl->outfill) {
sl->outfill_timer.expires=jiffies+sl->outfill*HZ; sl->outfill_timer.expires = jiffies + sl->outfill * HZ;
add_timer (&sl->outfill_timer); add_timer(&sl->outfill_timer);
} }
#endif #endif
@ -928,10 +926,9 @@ err_exit:
* This means flushing out any pending queues, and then returning. This * This means flushing out any pending queues, and then returning. This
* call is serialized against other ldisc functions. * call is serialized against other ldisc functions.
*/ */
static void static void slip_close(struct tty_struct *tty)
slip_close(struct tty_struct *tty)
{ {
struct slip *sl = (struct slip *) tty->disc_data; struct slip *sl = tty->disc_data;
/* First make sure we're connected. */ /* First make sure we're connected. */
if (!sl || sl->magic != SLIP_MAGIC || sl->tty != tty) if (!sl || sl->magic != SLIP_MAGIC || sl->tty != tty)
@ -955,8 +952,7 @@ slip_close(struct tty_struct *tty)
* STANDARD SLIP ENCAPSULATION * * STANDARD SLIP ENCAPSULATION *
************************************************************************/ ************************************************************************/
static int static int slip_esc(unsigned char *s, unsigned char *d, int len)
slip_esc(unsigned char *s, unsigned char *d, int len)
{ {
unsigned char *ptr = d; unsigned char *ptr = d;
unsigned char c; unsigned char c;
@ -975,16 +971,16 @@ slip_esc(unsigned char *s, unsigned char *d, int len)
*/ */
while (len-- > 0) { while (len-- > 0) {
switch(c = *s++) { switch (c = *s++) {
case END: case END:
*ptr++ = ESC; *ptr++ = ESC;
*ptr++ = ESC_END; *ptr++ = ESC_END;
break; break;
case ESC: case ESC:
*ptr++ = ESC; *ptr++ = ESC;
*ptr++ = ESC_ESC; *ptr++ = ESC_ESC;
break; break;
default: default:
*ptr++ = c; *ptr++ = c;
break; break;
} }
@ -996,33 +992,31 @@ slip_esc(unsigned char *s, unsigned char *d, int len)
static void slip_unesc(struct slip *sl, unsigned char s) static void slip_unesc(struct slip *sl, unsigned char s)
{ {
switch(s) { switch (s) {
case END: case END:
#ifdef CONFIG_SLIP_SMART #ifdef CONFIG_SLIP_SMART
/* drop keeptest bit = VSV */ /* drop keeptest bit = VSV */
if (test_bit(SLF_KEEPTEST, &sl->flags)) if (test_bit(SLF_KEEPTEST, &sl->flags))
clear_bit(SLF_KEEPTEST, &sl->flags); clear_bit(SLF_KEEPTEST, &sl->flags);
#endif #endif
if (!test_and_clear_bit(SLF_ERROR, &sl->flags) && (sl->rcount > 2)) { if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
&& (sl->rcount > 2))
sl_bump(sl); sl_bump(sl);
}
clear_bit(SLF_ESCAPE, &sl->flags); clear_bit(SLF_ESCAPE, &sl->flags);
sl->rcount = 0; sl->rcount = 0;
return; return;
case ESC: case ESC:
set_bit(SLF_ESCAPE, &sl->flags); set_bit(SLF_ESCAPE, &sl->flags);
return; return;
case ESC_ESC: case ESC_ESC:
if (test_and_clear_bit(SLF_ESCAPE, &sl->flags)) { if (test_and_clear_bit(SLF_ESCAPE, &sl->flags))
s = ESC; s = ESC;
}
break; break;
case ESC_END: case ESC_END:
if (test_and_clear_bit(SLF_ESCAPE, &sl->flags)) { if (test_and_clear_bit(SLF_ESCAPE, &sl->flags))
s = END; s = END;
}
break; break;
} }
if (!test_bit(SLF_ERROR, &sl->flags)) { if (!test_bit(SLF_ERROR, &sl->flags)) {
@ -1041,8 +1035,7 @@ static void slip_unesc(struct slip *sl, unsigned char s)
* 6 BIT SLIP ENCAPSULATION * * 6 BIT SLIP ENCAPSULATION *
************************************************************************/ ************************************************************************/
int static int slip_esc6(unsigned char *s, unsigned char *d, int len)
slip_esc6(unsigned char *s, unsigned char *d, int len)
{ {
unsigned char *ptr = d; unsigned char *ptr = d;
unsigned char c; unsigned char c;
@ -1079,8 +1072,7 @@ slip_esc6(unsigned char *s, unsigned char *d, int len)
return ptr - d; return ptr - d;
} }
void static void slip_unesc6(struct slip *sl, unsigned char s)
slip_unesc6(struct slip *sl, unsigned char s)
{ {
unsigned char c; unsigned char c;
@ -1091,13 +1083,13 @@ slip_unesc6(struct slip *sl, unsigned char s)
clear_bit(SLF_KEEPTEST, &sl->flags); clear_bit(SLF_KEEPTEST, &sl->flags);
#endif #endif
if (!test_and_clear_bit(SLF_ERROR, &sl->flags) && (sl->rcount > 2)) { if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
&& (sl->rcount > 2))
sl_bump(sl); sl_bump(sl);
}
sl->rcount = 0; sl->rcount = 0;
sl->xbits = 0; sl->xbits = 0;
sl->xdata = 0; sl->xdata = 0;
} else if (s >= 0x30 && s < 0x70) { } else if (s >= 0x30 && s < 0x70) {
sl->xdata = (sl->xdata << 6) | ((s - 0x30) & 0x3F); sl->xdata = (sl->xdata << 6) | ((s - 0x30) & 0x3F);
sl->xbits += 6; sl->xbits += 6;
if (sl->xbits >= 8) { if (sl->xbits >= 8) {
@ -1112,24 +1104,24 @@ slip_unesc6(struct slip *sl, unsigned char s)
set_bit(SLF_ERROR, &sl->flags); set_bit(SLF_ERROR, &sl->flags);
} }
} }
} }
} }
#endif /* CONFIG_SLIP_MODE_SLIP6 */ #endif /* CONFIG_SLIP_MODE_SLIP6 */
/* Perform I/O control on an active SLIP channel. */ /* Perform I/O control on an active SLIP channel. */
static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) static int slip_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{ {
struct slip *sl = (struct slip *) tty->disc_data; struct slip *sl = tty->disc_data;
unsigned int tmp; unsigned int tmp;
int __user *p = (int __user *)arg; int __user *p = (int __user *)arg;
/* First make sure we're connected. */ /* First make sure we're connected. */
if (!sl || sl->magic != SLIP_MAGIC) { if (!sl || sl->magic != SLIP_MAGIC)
return -EINVAL; return -EINVAL;
}
switch(cmd) { switch (cmd) {
case SIOCGIFNAME: case SIOCGIFNAME:
tmp = strlen(sl->dev->name) + 1; tmp = strlen(sl->dev->name) + 1;
if (copy_to_user((void __user *)arg, sl->dev->name, tmp)) if (copy_to_user((void __user *)arg, sl->dev->name, tmp))
return -EFAULT; return -EFAULT;
@ -1144,34 +1136,31 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
if (get_user(tmp, p)) if (get_user(tmp, p))
return -EFAULT; return -EFAULT;
#ifndef SL_INCLUDE_CSLIP #ifndef SL_INCLUDE_CSLIP
if (tmp & (SL_MODE_CSLIP|SL_MODE_ADAPTIVE)) { if (tmp & (SL_MODE_CSLIP|SL_MODE_ADAPTIVE))
return -EINVAL; return -EINVAL;
}
#else #else
if ((tmp & (SL_MODE_ADAPTIVE | SL_MODE_CSLIP)) == if ((tmp & (SL_MODE_ADAPTIVE | SL_MODE_CSLIP)) ==
(SL_MODE_ADAPTIVE | SL_MODE_CSLIP)) { (SL_MODE_ADAPTIVE | SL_MODE_CSLIP))
/* return -EINVAL; */ /* return -EINVAL; */
tmp &= ~SL_MODE_ADAPTIVE; tmp &= ~SL_MODE_ADAPTIVE;
}
#endif #endif
#ifndef CONFIG_SLIP_MODE_SLIP6 #ifndef CONFIG_SLIP_MODE_SLIP6
if (tmp & SL_MODE_SLIP6) { if (tmp & SL_MODE_SLIP6)
return -EINVAL; return -EINVAL;
}
#endif #endif
sl->mode = tmp; sl->mode = tmp;
sl->dev->type = ARPHRD_SLIP+sl->mode; sl->dev->type = ARPHRD_SLIP + sl->mode;
return 0; return 0;
case SIOCSIFHWADDR: case SIOCSIFHWADDR:
return -EINVAL; return -EINVAL;
#ifdef CONFIG_SLIP_SMART #ifdef CONFIG_SLIP_SMART
/* VSV changes start here */ /* VSV changes start here */
case SIOCSKEEPALIVE: case SIOCSKEEPALIVE:
if (get_user(tmp, p)) if (get_user(tmp, p))
return -EFAULT; return -EFAULT;
if (tmp > 255) /* max for unchar */ if (tmp > 255) /* max for unchar */
return -EINVAL; return -EINVAL;
spin_lock_bh(&sl->lock); spin_lock_bh(&sl->lock);
@ -1179,40 +1168,42 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return -ENODEV; return -ENODEV;
} }
if ((sl->keepalive = (unchar) tmp) != 0) { sl->keepalive = (u8)tmp;
mod_timer(&sl->keepalive_timer, jiffies+sl->keepalive*HZ); if (sl->keepalive != 0) {
mod_timer(&sl->keepalive_timer,
jiffies + sl->keepalive * HZ);
set_bit(SLF_KEEPTEST, &sl->flags); set_bit(SLF_KEEPTEST, &sl->flags);
} else { } else
del_timer (&sl->keepalive_timer); del_timer(&sl->keepalive_timer);
}
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return 0; return 0;
case SIOCGKEEPALIVE: case SIOCGKEEPALIVE:
if (put_user(sl->keepalive, p)) if (put_user(sl->keepalive, p))
return -EFAULT; return -EFAULT;
return 0; return 0;
case SIOCSOUTFILL: case SIOCSOUTFILL:
if (get_user(tmp, p)) if (get_user(tmp, p))
return -EFAULT; return -EFAULT;
if (tmp > 255) /* max for unchar */ if (tmp > 255) /* max for unchar */
return -EINVAL; return -EINVAL;
spin_lock_bh(&sl->lock); spin_lock_bh(&sl->lock);
if (!sl->tty) { if (!sl->tty) {
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return -ENODEV; return -ENODEV;
} }
if ((sl->outfill = (unchar) tmp) != 0){ sl->outfill = (u8)tmp;
mod_timer(&sl->outfill_timer, jiffies+sl->outfill*HZ); if (sl->outfill != 0) {
mod_timer(&sl->outfill_timer,
jiffies + sl->outfill * HZ);
set_bit(SLF_OUTWAIT, &sl->flags); set_bit(SLF_OUTWAIT, &sl->flags);
} else { } else
del_timer (&sl->outfill_timer); del_timer(&sl->outfill_timer);
}
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return 0; return 0;
case SIOCGOUTFILL: case SIOCGOUTFILL:
if (put_user(sl->outfill, p)) if (put_user(sl->outfill, p))
return -EFAULT; return -EFAULT;
return 0; return 0;
@ -1229,7 +1220,7 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
to allow get/set outfill/keepalive parameter to allow get/set outfill/keepalive parameter
by ifconfig */ by ifconfig */
static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd) static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct slip *sl = netdev_priv(dev); struct slip *sl = netdev_priv(dev);
unsigned long *p = (unsigned long *)&rq->ifr_ifru; unsigned long *p = (unsigned long *)&rq->ifr_ifru;
@ -1244,58 +1235,61 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
return -ENODEV; return -ENODEV;
} }
switch(cmd){ switch (cmd) {
case SIOCSKEEPALIVE: case SIOCSKEEPALIVE:
/* max for unchar */ /* max for unchar */
if ((unsigned)*p > 255) { if ((unsigned)*p > 255) {
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return -EINVAL; return -EINVAL;
} }
sl->keepalive = (unchar) *p; sl->keepalive = (u8)*p;
if (sl->keepalive != 0) { if (sl->keepalive != 0) {
sl->keepalive_timer.expires=jiffies+sl->keepalive*HZ; sl->keepalive_timer.expires =
mod_timer(&sl->keepalive_timer, jiffies+sl->keepalive*HZ); jiffies + sl->keepalive * HZ;
mod_timer(&sl->keepalive_timer,
jiffies + sl->keepalive * HZ);
set_bit(SLF_KEEPTEST, &sl->flags); set_bit(SLF_KEEPTEST, &sl->flags);
} else { } else
del_timer(&sl->keepalive_timer); del_timer(&sl->keepalive_timer);
}
break; break;
case SIOCGKEEPALIVE: case SIOCGKEEPALIVE:
*p = sl->keepalive; *p = sl->keepalive;
break; break;
case SIOCSOUTFILL: case SIOCSOUTFILL:
if ((unsigned)*p > 255) { /* max for unchar */ if ((unsigned)*p > 255) { /* max for unchar */
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return -EINVAL; return -EINVAL;
} }
if ((sl->outfill = (unchar)*p) != 0){ sl->outfill = (u8)*p;
mod_timer(&sl->outfill_timer, jiffies+sl->outfill*HZ); if (sl->outfill != 0) {
mod_timer(&sl->outfill_timer,
jiffies + sl->outfill * HZ);
set_bit(SLF_OUTWAIT, &sl->flags); set_bit(SLF_OUTWAIT, &sl->flags);
} else { } else
del_timer (&sl->outfill_timer); del_timer(&sl->outfill_timer);
} break;
break;
case SIOCGOUTFILL: case SIOCGOUTFILL:
*p = sl->outfill; *p = sl->outfill;
break; break;
case SIOCSLEASE: case SIOCSLEASE:
/* Resolve race condition, when ioctl'ing hanged up /* Resolve race condition, when ioctl'ing hanged up
and opened by another process device. and opened by another process device.
*/ */
if (sl->tty != current->signal->tty && sl->pid != current->pid) { if (sl->tty != current->signal->tty &&
sl->pid != current->pid) {
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
return -EPERM; return -EPERM;
} }
sl->leased = 0; sl->leased = 0;
if (*p) if (*p)
sl->leased = 1; sl->leased = 1;
break; break;
case SIOCGLEASE: case SIOCGLEASE:
*p = sl->leased; *p = sl->leased;
}; };
spin_unlock_bh(&sl->lock); spin_unlock_bh(&sl->lock);
@ -1327,7 +1321,7 @@ static int __init slip_init(void)
" (6 bit encapsulation enabled)" " (6 bit encapsulation enabled)"
#endif #endif
".\n", ".\n",
SLIP_VERSION, slip_maxdev ); SLIP_VERSION, slip_maxdev);
#if defined(SL_INCLUDE_CSLIP) #if defined(SL_INCLUDE_CSLIP)
printk(KERN_INFO "CSLIP: code copyright 1989 Regents of the University of California.\n"); printk(KERN_INFO "CSLIP: code copyright 1989 Regents of the University of California.\n");
#endif #endif
@ -1335,14 +1329,16 @@ static int __init slip_init(void)
printk(KERN_INFO "SLIP linefill/keepalive option.\n"); printk(KERN_INFO "SLIP linefill/keepalive option.\n");
#endif #endif
slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev, GFP_KERNEL); slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev,
GFP_KERNEL);
if (!slip_devs) { if (!slip_devs) {
printk(KERN_ERR "SLIP: Can't allocate slip devices array! Uaargh! (-> No SLIP available)\n"); printk(KERN_ERR "SLIP: Can't allocate slip devices array.\n");
return -ENOMEM; return -ENOMEM;
} }
/* Fill in our line protocol discipline, and register it */ /* Fill in our line protocol discipline, and register it */
if ((status = tty_register_ldisc(N_SLIP, &sl_ldisc)) != 0) { status = tty_register_ldisc(N_SLIP, &sl_ldisc);
if (status != 0) {
printk(KERN_ERR "SLIP: can't register line discipline (err = %d)\n", status); printk(KERN_ERR "SLIP: can't register line discipline (err = %d)\n", status);
kfree(slip_devs); kfree(slip_devs);
} }
@ -1402,10 +1398,9 @@ static void __exit slip_exit(void)
kfree(slip_devs); kfree(slip_devs);
slip_devs = NULL; slip_devs = NULL;
if ((i = tty_unregister_ldisc(N_SLIP))) i = tty_unregister_ldisc(N_SLIP);
{ if (i != 0)
printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i); printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
}
} }
module_init(slip_init); module_init(slip_init);
@ -1419,17 +1414,15 @@ module_exit(slip_exit);
static void sl_outfill(unsigned long sls) static void sl_outfill(unsigned long sls)
{ {
struct slip *sl=(struct slip *)sls; struct slip *sl = (struct slip *)sls;
spin_lock(&sl->lock); spin_lock(&sl->lock);
if (sl->tty == NULL) if (sl->tty == NULL)
goto out; goto out;
if(sl->outfill) if (sl->outfill) {
{ if (test_bit(SLF_OUTWAIT, &sl->flags)) {
if( test_bit(SLF_OUTWAIT, &sl->flags) )
{
/* no packets were transmitted, do outfill */ /* no packets were transmitted, do outfill */
#ifdef CONFIG_SLIP_MODE_SLIP6 #ifdef CONFIG_SLIP_MODE_SLIP6
unsigned char s = (sl->mode & SL_MODE_SLIP6)?0x70:END; unsigned char s = (sl->mode & SL_MODE_SLIP6)?0x70:END;
@ -1437,13 +1430,11 @@ static void sl_outfill(unsigned long sls)
unsigned char s = END; unsigned char s = END;
#endif #endif
/* put END into tty queue. Is it right ??? */ /* put END into tty queue. Is it right ??? */
if (!netif_queue_stopped(sl->dev)) if (!netif_queue_stopped(sl->dev)) {
{
/* if device busy no outfill */ /* if device busy no outfill */
sl->tty->driver->write(sl->tty, &s, 1); sl->tty->driver->write(sl->tty, &s, 1);
} }
} } else
else
set_bit(SLF_OUTWAIT, &sl->flags); set_bit(SLF_OUTWAIT, &sl->flags);
mod_timer(&sl->outfill_timer, jiffies+sl->outfill*HZ); mod_timer(&sl->outfill_timer, jiffies+sl->outfill*HZ);
@ -1454,31 +1445,29 @@ out:
static void sl_keepalive(unsigned long sls) static void sl_keepalive(unsigned long sls)
{ {
struct slip *sl=(struct slip *)sls; struct slip *sl = (struct slip *)sls;
spin_lock(&sl->lock); spin_lock(&sl->lock);
if (sl->tty == NULL) if (sl->tty == NULL)
goto out; goto out;
if( sl->keepalive) if (sl->keepalive) {
{ if (test_bit(SLF_KEEPTEST, &sl->flags)) {
if(test_bit(SLF_KEEPTEST, &sl->flags))
{
/* keepalive still high :(, we must hangup */ /* keepalive still high :(, we must hangup */
if( sl->outfill ) /* outfill timer must be deleted too */ if (sl->outfill)
/* outfill timer must be deleted too */
(void)del_timer(&sl->outfill_timer); (void)del_timer(&sl->outfill_timer);
printk(KERN_DEBUG "%s: no packets received during keepalive timeout, hangup.\n", sl->dev->name); printk(KERN_DEBUG "%s: no packets received during keepalive timeout, hangup.\n", sl->dev->name);
tty_hangup(sl->tty); /* this must hangup tty & close slip */ /* this must hangup tty & close slip */
tty_hangup(sl->tty);
/* I think we need not something else */ /* I think we need not something else */
goto out; goto out;
} } else
else
set_bit(SLF_KEEPTEST, &sl->flags); set_bit(SLF_KEEPTEST, &sl->flags);
mod_timer(&sl->keepalive_timer, jiffies+sl->keepalive*HZ); mod_timer(&sl->keepalive_timer, jiffies+sl->keepalive*HZ);
} }
out: out:
spin_unlock(&sl->lock); spin_unlock(&sl->lock);
} }