X-Git-Url: http://rtime.felk.cvut.cz/gitweb/linux-lin.git/blobdiff_plain/3a009025af041a40c8e88be5f23203727d7abc22..ea28a0514e25c0de0199f141b083780faaffccbf:/sllin/sllin.c diff --git a/sllin/sllin.c b/sllin/sllin.c index 1b49df6..7793541 100644 --- a/sllin/sllin.c +++ b/sllin/sllin.c @@ -1,11 +1,11 @@ /* - * slcan.c - serial line CAN interface driver (using tty line discipline) + * sllin.c - serial line LIN interface driver (using tty line discipline) * * This file is derived from linux/drivers/net/slip.c * * slip.c Authors : Laurence Culhane * Fred N. van Kempen - * slcan.c Author : Oliver Hartkopp + * sllin.c Author : Oliver Hartkopp * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -57,27 +57,31 @@ #include #include #include +#include + +/* Should be in include/linux/tty.h */ +#define N_SLLIN 25 static __initdata const char banner[] = - KERN_INFO "slcan: serial line CAN interface driver\n"; + KERN_INFO "sllin: serial line LIN interface driver\n"; -MODULE_ALIAS_LDISC(N_SLCAN); -MODULE_DESCRIPTION("serial line CAN interface"); +MODULE_ALIAS_LDISC(N_SLLIN); +MODULE_DESCRIPTION("serial line LIN interface"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Oliver Hartkopp "); -#define SLCAN_MAGIC 0x53CA +#define SLLIN_MAGIC 0x53CA -static int maxdev = 10; /* MAX number of SLCAN channels; +static int maxdev = 10; /* MAX number of SLLIN channels; This can be overridden with - insmod slcan.ko maxdev=nnn */ + insmod sllin.ko maxdev=nnn */ module_param(maxdev, int, 0); -MODULE_PARM_DESC(maxdev, "Maximum number of slcan interfaces"); +MODULE_PARM_DESC(maxdev, "Maximum number of sllin interfaces"); /* maximum rx buffer len: extended CAN frame with timestamp */ #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) -struct slcan { +struct sllin { int magic; /* Various fields. */ @@ -98,139 +102,105 @@ struct slcan { unsigned char leased; dev_t line; - pid_t pid; + struct task_struct *kwthread; + wait_queue_head_t kwt_wq; }; -static struct net_device **slcan_devs; +static struct net_device **sllin_devs; - /************************************************************************ - * SLCAN ENCAPSULATION FORMAT * - ************************************************************************/ -/* - * A CAN frame has a can_id (11 bit standard frame format OR 29 bit extended - * frame format) a data length code (can_dlc) which can be from 0 to 8 - * and up to data bytes as payload. - * Additionally a CAN frame may become a remote transmission frame if the - * RTR-bit is set. This causes another ECU to send a CAN frame with the - * given can_id. - * - * The SLCAN ASCII representation of these different frame types is: - * * - * - * Extended frames (29 bit) are defined by capital characters in the type. - * RTR frames are defined as 'r' types - normal frames have 't' type: - * t => 11 bit data frame - * r => 11 bit RTR frame - * T => 29 bit data frame - * R => 29 bit RTR frame - * - * The is 3 (standard) or 8 (extended) bytes in ASCII Hex (base64). - * The is a one byte ASCII number ('0' - '8') - * The section has at much ASCII Hex bytes as defined by the - * - * Examples: - * - * t1230 : can_id 0x123, can_dlc 0, no data - * t4563112233 : can_id 0x456, can_dlc 3, data 0x11 0x22 0x33 - * T12ABCDEF2AA55 : extended can_id 0x12ABCDEF, can_dlc 2, data 0xAA 0x55 - * r1230 : can_id 0x123, can_dlc 0, no data, remote transmission request - * - */ - - /************************************************************************ - * STANDARD SLCAN DECAPSULATION * - ************************************************************************/ - -static int asc2nibble(char c) +static int sltty_change_speed(struct tty_struct *tty, unsigned speed) { + struct ktermios old_termios; + int cflag; + + mutex_lock(&tty->termios_mutex); + old_termios = *(tty->termios); + cflag = tty->termios->c_cflag; + tty_encode_baud_rate(tty, speed, speed); + if (tty->ops->set_termios) + tty->ops->set_termios(tty, &old_termios); + //priv->io.speed = speed; + mutex_unlock(&tty->termios_mutex); - if ((c >= '0') && (c <= '9')) - return c - '0'; - - if ((c >= 'A') && (c <= 'F')) - return c - 'A' + 10; - - if ((c >= 'a') && (c <= 'f')) - return c - 'a' + 10; - - return 16; /* error */ + return 0; } + /* Send one completely decapsulated can_frame to the network layer */ -static void slc_bump(struct slcan *sl) +static void sll_bump(struct sllin *sl) { - struct sk_buff *skb; - struct can_frame cf; - int i, dlc_pos, tmp; - unsigned long ultmp; - char cmd = sl->rbuff[0]; - - if ((cmd != 't') && (cmd != 'T') && (cmd != 'r') && (cmd != 'R')) - return; - - if (cmd & 0x20) /* tiny chars 'r' 't' => standard frame format */ - dlc_pos = 4; /* dlc position tiiid */ - else - dlc_pos = 9; /* dlc position Tiiiiiiiid */ - - if (!((sl->rbuff[dlc_pos] >= '0') && (sl->rbuff[dlc_pos] < '9'))) - return; - - cf.can_dlc = sl->rbuff[dlc_pos] - '0'; /* get can_dlc from ASCII val */ - - sl->rbuff[dlc_pos] = 0; /* terminate can_id string */ - - if (strict_strtoul(sl->rbuff+1, 16, &ultmp)) - return; - - cf.can_id = ultmp; - - if (!(cmd & 0x20)) /* NO tiny chars => extended frame format */ - cf.can_id |= CAN_EFF_FLAG; - - if ((cmd | 0x20) == 'r') /* RTR frame */ - cf.can_id |= CAN_RTR_FLAG; - - *(u64 *) (&cf.data) = 0; /* clear payload */ - - for (i = 0, dlc_pos++; i < cf.can_dlc; i++) { - - tmp = asc2nibble(sl->rbuff[dlc_pos++]); - if (tmp > 0x0F) - return; - cf.data[i] = (tmp << 4); - tmp = asc2nibble(sl->rbuff[dlc_pos++]); - if (tmp > 0x0F) - return; - cf.data[i] |= tmp; - } - - - skb = dev_alloc_skb(sizeof(struct can_frame)); - if (!skb) - return; - - skb->dev = sl->dev; - skb->protocol = htons(ETH_P_CAN); - skb->pkt_type = PACKET_BROADCAST; - skb->ip_summed = CHECKSUM_UNNECESSARY; - memcpy(skb_put(skb, sizeof(struct can_frame)), - &cf, sizeof(struct can_frame)); - netif_rx(skb); - - sl->dev->stats.rx_packets++; - sl->dev->stats.rx_bytes += cf.can_dlc; +// struct sk_buff *skb; +// struct can_frame cf; +// int i, dlc_pos, tmp; +// unsigned long ultmp; +// char cmd = sl->rbuff[0]; +// +// if ((cmd != 't') && (cmd != 'T') && (cmd != 'r') && (cmd != 'R')) +// return; +// +// if (cmd & 0x20) /* tiny chars 'r' 't' => standard frame format */ +// dlc_pos = 4; /* dlc position tiiid */ +// else +// dlc_pos = 9; /* dlc position Tiiiiiiiid */ +// +// if (!((sl->rbuff[dlc_pos] >= '0') && (sl->rbuff[dlc_pos] < '9'))) +// return; +// +// cf.can_dlc = sl->rbuff[dlc_pos] - '0'; /* get can_dlc from ASCII val */ +// +// sl->rbuff[dlc_pos] = 0; /* terminate can_id string */ +// +// if (strict_strtoul(sl->rbuff+1, 16, &ultmp)) +// return; +// +// cf.can_id = ultmp; +// +// if (!(cmd & 0x20)) /* NO tiny chars => extended frame format */ +// cf.can_id |= CAN_EFF_FLAG; +// +// if ((cmd | 0x20) == 'r') /* RTR frame */ +// cf.can_id |= CAN_RTR_FLAG; +// +// *(u64 *) (&cf.data) = 0; /* clear payload */ +// +// for (i = 0, dlc_pos++; i < cf.can_dlc; i++) { +// +// tmp = asc2nibble(sl->rbuff[dlc_pos++]); +// if (tmp > 0x0F) +// return; +// cf.data[i] = (tmp << 4); +// tmp = asc2nibble(sl->rbuff[dlc_pos++]); +// if (tmp > 0x0F) +// return; +// cf.data[i] |= tmp; +// } +// +// +// skb = dev_alloc_skb(sizeof(struct can_frame)); +// if (!skb) +// return; +// +// skb->dev = sl->dev; +// skb->protocol = htons(ETH_P_CAN); +// skb->pkt_type = PACKET_BROADCAST; +// skb->ip_summed = CHECKSUM_UNNECESSARY; +// memcpy(skb_put(skb, sizeof(struct can_frame)), +// &cf, sizeof(struct can_frame)); +// netif_rx(skb); +// +// sl->dev->stats.rx_packets++; +// sl->dev->stats.rx_bytes += cf.can_dlc; } /* parse tty input stream */ -static void slcan_unesc(struct slcan *sl, unsigned char s) +static void sllin_unesc(struct sllin *sl, unsigned char s) { if ((s == '\r') || (s == '\a')) { /* CR or BEL ends the pdu */ if (!test_and_clear_bit(SLF_ERROR, &sl->flags) && (sl->rcount > 4)) { - slc_bump(sl); + sll_bump(sl); } sl->rcount = 0; } else { @@ -247,60 +217,68 @@ static void slcan_unesc(struct slcan *sl, unsigned char s) } /************************************************************************ - * STANDARD SLCAN ENCAPSULATION * + * STANDARD SLLIN ENCAPSULATION * ************************************************************************/ -/* Encapsulate one can_frame and stuff into a TTY queue. */ -static void slc_encaps(struct slcan *sl, struct can_frame *cf) +/* Convert particular CAN frame into LIN frame and send it to TTY queue. */ +static void sll_encaps(struct sllin *sl, struct can_frame *cf) { int actual, idx, i; - char cmd; + char lframe[16] = {0x00, 0x55}; /* Fake break, Sync byte */ + struct tty_struct *tty = sl->tty; - if (cf->can_id & CAN_RTR_FLAG) - cmd = 'R'; /* becomes 'r' in standard frame format */ - else - cmd = 'T'; /* becomes 't' in standard frame format */ + pr_debug("sllin: %s() invoked\n", __FUNCTION__); + /* We do care only about SFF frames */ if (cf->can_id & CAN_EFF_FLAG) - sprintf(sl->xbuff, "%c%08X%d", cmd, - cf->can_id & CAN_EFF_MASK, cf->can_dlc); - else - sprintf(sl->xbuff, "%c%03X%d", cmd | 0x20, - cf->can_id & CAN_SFF_MASK, cf->can_dlc); - - idx = strlen(sl->xbuff); - - for (i = 0; i < cf->can_dlc; i++) - sprintf(&sl->xbuff[idx + 2*i], "%02X", cf->data[i]); - - strcat(sl->xbuff, "\r"); /* add terminating character */ - - /* Order of next two lines is *very* important. - * When we are sending a little amount of data, - * the transfer may be completed inside the ops->write() - * routine, because it's running with interrupts enabled. - * In this case we *never* got WRITE_WAKEUP event, - * if we did not request it before write operation. - * 14 Oct 1994 Dmitry Gorodchanin. - */ - set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags); - actual = sl->tty->ops->write(sl->tty, sl->xbuff, strlen(sl->xbuff)); - sl->xleft = strlen(sl->xbuff) - actual; - sl->xhead = sl->xbuff + actual; - sl->dev->stats.tx_bytes += cf->can_dlc; + return; + + /* Send only header */ + if (cf->can_id & CAN_RTR_FLAG) { + pr_debug("sllin: %s() RTR CAN frame\n", __FUNCTION__); + lframe[2] = (u8)cf->can_id; /* Get one byte LIN ID */ + + sltty_change_speed(tty, 1200); + tty->ops->write(tty, &lframe[0], 1); + sltty_change_speed(tty, 2400); + tty->ops->write(tty, &lframe[1], 1); + tty->ops->write(tty, &lframe[2], 1); + } else { + pr_debug("sllin: %s() non-RTR CAN frame\n", __FUNCTION__); + /* idx = strlen(sl->xbuff); + + for (i = 0; i < cf->can_dlc; i++) + sprintf(&sl->xbuff[idx + 2*i], "%02X", cf->data[i]); + + * Order of next two lines is *very* important. + * When we are sending a little amount of data, + * the transfer may be completed inside the ops->write() + * routine, because it's running with interrupts enabled. + * In this case we *never* got WRITE_WAKEUP event, + * if we did not request it before write operation. + * 14 Oct 1994 Dmitry Gorodchanin. + + set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags); + actual = sl->tty->ops->write(sl->tty, sl->xbuff, strlen(sl->xbuff)); + sl->xleft = strlen(sl->xbuff) - actual; + sl->xhead = sl->xbuff + actual; + sl->dev->stats.tx_bytes += cf->can_dlc; + */ + } + } /* * Called by the driver when there's room for more data. If we have * more packets to send, we send them here. */ -static void slcan_write_wakeup(struct tty_struct *tty) +static void sllin_write_wakeup(struct tty_struct *tty) { int actual; - struct slcan *sl = (struct slcan *) tty->disc_data; + struct sllin *sl = (struct sllin *) tty->disc_data; /* First make sure we're connected. */ - if (!sl || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev)) + if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev)) return; if (sl->xleft <= 0) { @@ -318,9 +296,9 @@ static void slcan_write_wakeup(struct tty_struct *tty) } /* Send a can_frame to a TTY queue. */ -static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t sll_xmit(struct sk_buff *skb, struct net_device *dev) { - struct slcan *sl = netdev_priv(dev); + struct sllin *sl = netdev_priv(dev); if (skb->len != sizeof(struct can_frame)) goto out; @@ -337,7 +315,7 @@ static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev) } netif_stop_queue(sl->dev); - slc_encaps(sl, (struct can_frame *) skb->data); /* encaps & send */ + sll_encaps(sl, (struct can_frame *) skb->data); /* encaps & send */ spin_unlock(&sl->lock); out: @@ -351,9 +329,9 @@ out: ******************************************/ /* Netdevice UP -> DOWN routine */ -static int slc_close(struct net_device *dev) +static int sll_close(struct net_device *dev) { - struct slcan *sl = netdev_priv(dev); + struct sllin *sl = netdev_priv(dev); spin_lock_bh(&sl->lock); if (sl->tty) { @@ -369,9 +347,11 @@ static int slc_close(struct net_device *dev) } /* Netdevice DOWN -> UP routine */ -static int slc_open(struct net_device *dev) +static int sll_open(struct net_device *dev) { - struct slcan *sl = netdev_priv(dev); + struct sllin *sl = netdev_priv(dev); + + pr_debug("sllin: %s() invoked\n", __FUNCTION__); if (sl->tty == NULL) return -ENODEV; @@ -381,24 +361,24 @@ static int slc_open(struct net_device *dev) return 0; } -/* Hook the destructor so we can free slcan devs at the right point in time */ -static void slc_free_netdev(struct net_device *dev) +/* Hook the destructor so we can free sllin devs at the right point in time */ +static void sll_free_netdev(struct net_device *dev) { int i = dev->base_addr; free_netdev(dev); - slcan_devs[i] = NULL; + sllin_devs[i] = NULL; } -static const struct net_device_ops slc_netdev_ops = { - .ndo_open = slc_open, - .ndo_stop = slc_close, - .ndo_start_xmit = slc_xmit, +static const struct net_device_ops sll_netdev_ops = { + .ndo_open = sll_open, + .ndo_stop = sll_close, + .ndo_start_xmit = sll_xmit, }; -static void slc_setup(struct net_device *dev) +static void sll_setup(struct net_device *dev) { - dev->netdev_ops = &slc_netdev_ops; - dev->destructor = slc_free_netdev; + dev->netdev_ops = &sll_netdev_ops; + dev->destructor = sll_free_netdev; dev->hard_header_len = 0; dev->addr_len = 0; @@ -419,18 +399,18 @@ static void slc_setup(struct net_device *dev) /* * Handle the 'receiver data ready' interrupt. * This function is called by the 'tty_io' module in the kernel when - * a block of SLCAN data has been received, which can now be decapsulated + * a block of SLLIN data has been received, which can now be decapsulated * and sent on to some IP layer for further processing. This will not * be re-entered while running but other ldisc functions may be called * in parallel */ -static void slcan_receive_buf(struct tty_struct *tty, +static void sllin_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) { - struct slcan *sl = (struct slcan *) tty->disc_data; + struct sllin *sl = (struct sllin *) tty->disc_data; - if (!sl || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev)) + if (!sl || sl->magic != SLLIN_MAGIC || !netif_running(sl->dev)) return; /* Read the characters out of the buffer */ @@ -441,23 +421,45 @@ static void slcan_receive_buf(struct tty_struct *tty, cp++; continue; } - slcan_unesc(sl, *cp++); + sllin_unesc(sl, *cp++); } } +/***************************************** + * sllin_kwthread - kernel worker thread + *****************************************/ + +int sllin_kwthread(void *ptr) +{ + struct sllin *sl = (struct sllin *)ptr; + + printk(KERN_INFO "sllin: sllin_kwthread started.\n"); + + while (!kthread_should_stop()) { + + wait_event_killable(sl->kwt_wq, kthread_should_stop()); + + } + + printk(KERN_INFO "sllin: sllin_kwthread stopped.\n"); + + return 0; +} + + /************************************ - * slcan_open helper routines. + * sllin_open helper routines. ************************************/ /* Collect hanged up channels */ -static void slc_sync(void) +static void sll_sync(void) { int i; struct net_device *dev; - struct slcan *sl; + struct sllin *sl; for (i = 0; i < maxdev; i++) { - dev = slcan_devs[i]; + dev = sllin_devs[i]; if (dev == NULL) break; @@ -469,18 +471,18 @@ static void slc_sync(void) } } -/* Find a free SLCAN channel, and link in this `tty' line. */ -static struct slcan *slc_alloc(dev_t line) +/* Find a free SLLIN channel, and link in this `tty' line. */ +static struct sllin *sll_alloc(dev_t line) { int i; struct net_device *dev = NULL; - struct slcan *sl; + struct sllin *sl; - if (slcan_devs == NULL) + if (sllin_devs == NULL) return NULL; /* Master array missing ! */ for (i = 0; i < maxdev; i++) { - dev = slcan_devs[i]; + dev = sllin_devs[i]; if (dev == NULL) break; @@ -495,15 +497,15 @@ static struct slcan *slc_alloc(dev_t line) if (test_bit(SLF_INUSE, &sl->flags)) { unregister_netdevice(dev); dev = NULL; - slcan_devs[i] = NULL; + sllin_devs[i] = NULL; } } if (!dev) { char name[IFNAMSIZ]; - sprintf(name, "slcan%d", i); + sprintf(name, "sllin%d", i); - dev = alloc_netdev(sizeof(*sl), name, slc_setup); + dev = alloc_netdev(sizeof(*sl), name, sll_setup); if (!dev) return NULL; dev->base_addr = i; @@ -512,28 +514,29 @@ static struct slcan *slc_alloc(dev_t line) sl = netdev_priv(dev); /* Initialize channel control data */ - sl->magic = SLCAN_MAGIC; + sl->magic = SLLIN_MAGIC; sl->dev = dev; spin_lock_init(&sl->lock); - slcan_devs[i] = dev; + sllin_devs[i] = dev; return sl; } /* - * Open the high-level part of the SLCAN channel. + * Open the high-level part of the SLLIN channel. * This function is called by the TTY module when the - * SLCAN line discipline is called for. Because we are + * SLLIN line discipline is called for. Because we are * sure the tty line exists, we only have to link it to - * a free SLCAN channel... + * a free SLLIN channel... * * Called in process context serialized from other ldisc calls. */ -static int slcan_open(struct tty_struct *tty) +static int sllin_open(struct tty_struct *tty) { - struct slcan *sl; + struct sllin *sl; int err; + pr_debug("sllin: %s() invoked\n", __FUNCTION__); if (!capable(CAP_NET_ADMIN)) return -EPERM; @@ -542,42 +545,46 @@ static int slcan_open(struct tty_struct *tty) return -EOPNOTSUPP; /* RTnetlink lock is misused here to serialize concurrent - opens of slcan channels. There are better ways, but it is + opens of sllin channels. There are better ways, but it is the simplest one. */ rtnl_lock(); /* Collect hanged up channels. */ - slc_sync(); + sll_sync(); sl = tty->disc_data; err = -EEXIST; /* First make sure we're not already connected. */ - if (sl && sl->magic == SLCAN_MAGIC) + if (sl && sl->magic == SLLIN_MAGIC) goto err_exit; - /* OK. Find a free SLCAN channel to use. */ + /* OK. Find a free SLLIN channel to use. */ err = -ENFILE; - sl = slc_alloc(tty_devnum(tty)); + sl = sll_alloc(tty_devnum(tty)); if (sl == NULL) goto err_exit; sl->tty = tty; tty->disc_data = sl; sl->line = tty_devnum(tty); - sl->pid = current->pid; if (!test_bit(SLF_INUSE, &sl->flags)) { - /* Perform the low-level SLCAN initialization. */ + /* Perform the low-level SLLIN initialization. */ sl->rcount = 0; sl->xleft = 0; set_bit(SLF_INUSE, &sl->flags); + init_waitqueue_head(&sl->kwt_wq); + sl->kwthread = kthread_run(sllin_kwthread, sl, "sllin"); + if (sl->kwthread == NULL) + goto err_free_chan; + err = register_netdevice(sl->dev); if (err) - goto err_free_chan; + goto err_free_chan_and_thread; } /* Done. We have linked the TTY line to a channel. */ @@ -587,6 +594,10 @@ static int slcan_open(struct tty_struct *tty) /* TTY layer expects 0 on success */ return 0; +err_free_chan_and_thread: + kthread_stop(sl->kwthread); + sl->kwthread = NULL; + err_free_chan: sl->tty = NULL; tty->disc_data = NULL; @@ -600,21 +611,24 @@ err_exit: } /* - * Close down a SLCAN channel. + * Close down a SLLIN channel. * This means flushing out any pending queues, and then returning. This * call is serialized against other ldisc functions. * * We also use this method for a hangup event. */ -static void slcan_close(struct tty_struct *tty) +static void sllin_close(struct tty_struct *tty) { - struct slcan *sl = (struct slcan *) tty->disc_data; + struct sllin *sl = (struct sllin *) tty->disc_data; /* First make sure we're connected. */ - if (!sl || sl->magic != SLCAN_MAGIC || sl->tty != tty) + if (!sl || sl->magic != SLLIN_MAGIC || sl->tty != tty) return; + kthread_stop(sl->kwthread); + sl->kwthread = NULL; + tty->disc_data = NULL; sl->tty = NULL; if (!sl->leased) @@ -625,21 +639,21 @@ static void slcan_close(struct tty_struct *tty) /* This will complete via sl_free_netdev */ } -static int slcan_hangup(struct tty_struct *tty) +static int sllin_hangup(struct tty_struct *tty) { - slcan_close(tty); + sllin_close(tty); return 0; } -/* Perform I/O control on an active SLCAN channel. */ -static int slcan_ioctl(struct tty_struct *tty, struct file *file, +/* Perform I/O control on an active SLLIN channel. */ +static int sllin_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { - struct slcan *sl = (struct slcan *) tty->disc_data; + struct sllin *sl = (struct sllin *) tty->disc_data; unsigned int tmp; /* First make sure we're connected. */ - if (!sl || sl->magic != SLCAN_MAGIC) + if (!sl || sl->magic != SLLIN_MAGIC) return -EINVAL; switch (cmd) { @@ -657,19 +671,19 @@ static int slcan_ioctl(struct tty_struct *tty, struct file *file, } } -static struct tty_ldisc_ops slc_ldisc = { +static struct tty_ldisc_ops sll_ldisc = { .owner = THIS_MODULE, .magic = TTY_LDISC_MAGIC, - .name = "slcan", - .open = slcan_open, - .close = slcan_close, - .hangup = slcan_hangup, - .ioctl = slcan_ioctl, - .receive_buf = slcan_receive_buf, - .write_wakeup = slcan_write_wakeup, + .name = "sllin", + .open = sllin_open, + .close = sllin_close, + .hangup = sllin_hangup, + .ioctl = sllin_ioctl, + .receive_buf = sllin_receive_buf, + .write_wakeup = sllin_write_wakeup, }; -static int __init slcan_init(void) +static int __init sllin_init(void) { int status; @@ -677,32 +691,32 @@ static int __init slcan_init(void) maxdev = 4; /* Sanity */ printk(banner); - printk(KERN_INFO "slcan: %d dynamic interface channels.\n", maxdev); + printk(KERN_INFO "sllin: %d dynamic interface channels.\n", maxdev); - slcan_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL); - if (!slcan_devs) { - printk(KERN_ERR "slcan: can't allocate slcan device array!\n"); + sllin_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL); + if (!sllin_devs) { + printk(KERN_ERR "sllin: can't allocate sllin device array!\n"); return -ENOMEM; } /* Fill in our line protocol discipline, and register it */ - status = tty_register_ldisc(N_SLCAN, &slc_ldisc); + status = tty_register_ldisc(N_SLLIN, &sll_ldisc); if (status) { - printk(KERN_ERR "slcan: can't register line discipline\n"); - kfree(slcan_devs); + printk(KERN_ERR "sllin: can't register line discipline\n"); + kfree(sllin_devs); } return status; } -static void __exit slcan_exit(void) +static void __exit sllin_exit(void) { int i; struct net_device *dev; - struct slcan *sl; + struct sllin *sl; unsigned long timeout = jiffies + HZ; int busy = 0; - if (slcan_devs == NULL) + if (sllin_devs == NULL) return; /* First of all: check for active disciplines and hangup them. @@ -713,7 +727,7 @@ static void __exit slcan_exit(void) busy = 0; for (i = 0; i < maxdev; i++) { - dev = slcan_devs[i]; + dev = sllin_devs[i]; if (!dev) continue; sl = netdev_priv(dev); @@ -730,10 +744,10 @@ static void __exit slcan_exit(void) phase */ for (i = 0; i < maxdev; i++) { - dev = slcan_devs[i]; + dev = sllin_devs[i]; if (!dev) continue; - slcan_devs[i] = NULL; + sllin_devs[i] = NULL; sl = netdev_priv(dev); if (sl->tty) { @@ -746,13 +760,13 @@ static void __exit slcan_exit(void) unregister_netdev(dev); } - kfree(slcan_devs); - slcan_devs = NULL; + kfree(sllin_devs); + sllin_devs = NULL; - i = tty_unregister_ldisc(N_SLCAN); + i = tty_unregister_ldisc(N_SLLIN); if (i) - printk(KERN_ERR "slcan: can't unregister ldisc (err %d)\n", i); + printk(KERN_ERR "sllin: can't unregister ldisc (err %d)\n", i); } -module_init(slcan_init); -module_exit(slcan_exit); +module_init(sllin_init); +module_exit(sllin_exit);