*
* This file is derived from linux/drivers/net/slip.c
*
- * Therefore it has the same (strange?) behaviour not to unregister the
- * netdevice when detaching the tty. Is there any better solution?
- *
- * Do not try to attach, detach and re-attach a tty for this reason ...
- *
* slip.c Authors : Laurence Culhane <loz@holmes.demon.co.uk>
* Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>
- * slcan.c Author : Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- *
- * Copyright (c) 2007-2009 Volkswagen Group Electronic Research
+ * slcan.c Author : Oliver Hartkopp <socketcan@hartkopp.net>
*
* 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
#include <linux/if_slip.h>
#include <linux/delay.h>
#include <linux/init.h>
-
#include <socketcan/can.h>
#include <socketcan/can/version.h> /* for RCSID. Removed by mkpatch script */
MODULE_ALIAS_LDISC(N_SLCAN);
MODULE_DESCRIPTION("serial line CAN interface");
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
-
-#ifdef CONFIG_CAN_DEBUG_DEVICES
-static int debug;
-module_param(debug, int, S_IRUGO);
-#define DBG(args...) (debug & 1 ? \
- (printk(KERN_DEBUG "slcan %s: ", __func__), \
- printk(args)) : 0)
-#else
-#define DBG(args...)
+MODULE_AUTHOR("Oliver Hartkopp <socketcan@hartkopp.net>");
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+static inline void *kzalloc(size_t size, unsigned int __nocast flags)
+{
+ void *ret = kmalloc(size, flags);
+ if (ret)
+ memset(ret, 0, size);
+ return ret;
+}
#endif
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
#ifndef N_SLCAN
#error Your kernel does not support tty line discipline N_SLCAN
#endif
* rebuild to use the right value for N_SLCAN. This workaround will allow
* to use the slcan driver with an existing kernel.
*/
+#endif
#define SLCAN_MAGIC 0x53CA
static struct net_device **slcan_devs;
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
/* Netdevice get statistics request */
static struct net_device_stats *slc_get_stats(struct net_device *dev)
for (i = 0; i < cf->can_dlc; i++)
sprintf(&sl->xbuff[idx + 2*i], "%02X", cf->data[i]);
- DBG("ASCII frame = '%s'\n", sl->xbuff);
-
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 driver.write()
+ * 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.
*/
- sl->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
+ set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
actual = sl->tty->driver->write(sl->tty, sl->xbuff, strlen(sl->xbuff));
#else
/* Now serial buffer is almost free & we can start
* transmission of another packet */
stats->tx_packets++;
- tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+ clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
netif_wake_queue(sl->dev);
return;
}
sl->xhead += actual;
}
-
-/******************************************
- * Routines looking at netdevice side.
- ******************************************/
-
/* Send a can_frame to a TTY queue. */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
static int slc_xmit(struct sk_buff *skb, struct net_device *dev)
printk(KERN_WARNING "%s: xmit: iface is down\n", dev->name);
goto out;
}
-
if (sl->tty == NULL) {
spin_unlock(&sl->lock);
goto out;
}
+/******************************************
+ * Routines looking at netdevice side.
+ ******************************************/
+
/* Netdevice UP -> DOWN routine */
static int slc_close(struct net_device *dev)
{
spin_lock_bh(&sl->lock);
if (sl->tty) {
/* TTY discipline is running. */
- sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+ clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
}
netif_stop_queue(dev);
sl->rcount = 0;
};
#endif
-/* Netdevice register callback */
static void slc_setup(struct net_device *dev)
{
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,28)
- dev->netdev_ops = &slc_netdev_ops;
+ dev->netdev_ops = &slc_netdev_ops;
#else
dev->open = slc_open;
dev->stop = slc_close;
}
/******************************************
- * Routines looking at TTY side.
+ Routines looking at TTY side.
******************************************/
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
struct net_device_stats *stats = &sl->dev->stats;
#endif
- if (!sl || sl->magic != SLCAN_MAGIC ||
- !netif_running(sl->dev))
+ if (!sl || sl->magic != SLCAN_MAGIC || !netif_running(sl->dev))
return;
/* Read the characters out of the buffer */
************************************/
/* Collect hanged up channels */
-
static void slc_sync(void)
{
int i;
sl = netdev_priv(dev);
if (sl->tty || sl->leased)
continue;
- if (dev->flags&IFF_UP)
+ if (dev->flags & IFF_UP)
dev_close(dev);
}
}
-
/* Find a free SLCAN channel, and link in this `tty' line. */
static struct slcan *slc_alloc(dev_t line)
{
if (!dev) {
char name[IFNAMSIZ];
- sprintf(name, "can%d", i);
+ sprintf(name, "slcan%d", i);
dev = alloc_netdev(sizeof(*sl), name, slc_setup);
if (!dev)
/* Collect hanged up channels. */
slc_sync();
- sl = (struct slcan *) tty->disc_data;
+ sl = tty->disc_data;
err = -EEXIST;
/* First make sure we're not already connected. */
/* Done. We have linked the TTY line to a channel. */
rtnl_unlock();
-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
tty->receive_room = 65536; /* We don't flow control */
#endif
-
return sl->dev->base_addr;
err_free_chan:
*
* We also use this method for a hangup event.
*/
+
static void slcan_close(struct tty_struct *tty)
{
struct slcan *sl = (struct slcan *) tty->disc_data;
.write_wakeup = slcan_write_wakeup,
};
-/************************************
- * general slcan module init/exit
- ************************************/
-
static int __init slcan_init(void)
{
int status;
printk(banner);
printk(KERN_INFO "slcan: %d dynamic interface channels.\n", maxdev);
- slcan_devs = kmalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
+ slcan_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
if (!slcan_devs) {
printk(KERN_ERR "slcan: can't allocate slcan device array!\n");
return -ENOMEM;
}
- /* Clear the pointer array, we allocate devices when we need them */
- memset(slcan_devs, 0, sizeof(struct net_device *)*maxdev);
-
/* Fill in our line protocol discipline, and register it */
status = tty_register_ldisc(N_SLCAN, &slc_ldisc);
- if (status != 0) {
+ if (status) {
printk(KERN_ERR "slcan: can't register line discipline\n");
kfree(slcan_devs);
}
}
} while (busy && time_before(jiffies, timeout));
- /* FIXME (2.6.32+): hangup is async so we should wait when doing
- this second phase */
+ /* FIXME: hangup is async so we should wait when doing this second
+ phase */
for (i = 0; i < maxdev; i++) {
dev = slcan_devs[i];
projects / socketcan-devel.git / blobdiff