#include <asm/uaccess.h>
#endif
#include <linux/bitops.h>
-#include <linux/sched.h>
#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/in.h>
#include <linux/tty.h>
#include <linux/errno.h>
#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/rtnetlink.h>
#include <linux/if_arp.h>
#include <linux/if_ether.h>
-#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_DESCRIPTION("serial line CAN interface");
MODULE_LICENSE("GPL");
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)
#endif
/************************************************************************
- * SLCAN ENCAPSULATION FORMAT *
+ * SLCAN ENCAPSULATION FORMAT *
************************************************************************/
/*
*/
/************************************************************************
- * STANDARD SLCAN DECAPSULATION *
+ * STANDARD SLCAN DECAPSULATION *
************************************************************************/
static int asc2nibble(char c)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
struct net_device_stats *stats = slc_get_stats(sl->dev);
-#else
- struct net_device_stats *stats = &sl->dev->stats;
#endif
struct sk_buff *skb;
struct can_frame cf;
if (strict_strtoul(sl->rbuff+1, 16, &ultmp))
return;
#endif
+
cf.can_id = ultmp;
if (!(cmd & 0x20)) /* NO tiny chars => extended frame format */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
sl->dev->last_rx = jiffies;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
stats->rx_packets++;
stats->rx_bytes += cf.can_dlc;
+#else
+ sl->dev->stats.rx_packets++;
+ sl->dev->stats.rx_bytes += cf.can_dlc;
+#endif
}
/* parse tty input stream */
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
struct net_device_stats *stats = slc_get_stats(sl->dev);
-#else
- struct net_device_stats *stats = &sl->dev->stats;
#endif
if ((s == '\r') || (s == '\a')) { /* CR or BEL ends the pdu */
sl->rbuff[sl->rcount++] = s;
return;
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
stats->rx_over_errors++;
+#else
+ sl->dev->stats.rx_over_errors++;
+#endif
set_bit(SLF_ERROR, &sl->flags);
}
}
}
/************************************************************************
- * STANDARD SLCAN ENCAPSULATION *
+ * STANDARD SLCAN ENCAPSULATION *
************************************************************************/
/* Encapsulate one can_frame and stuff into a TTY queue. */
{
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
struct net_device_stats *stats = slc_get_stats(sl->dev);
-#else
- struct net_device_stats *stats = &sl->dev->stats;
#endif
int actual, idx, i;
char cmd;
/* 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
#endif
sl->xleft = strlen(sl->xbuff) - actual;
sl->xhead = sl->xbuff + actual;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
stats->tx_bytes += cf->can_dlc;
+#else
+ sl->dev->stats.tx_bytes += cf->can_dlc;
+#endif
}
/*
struct slcan *sl = (struct slcan *) tty->disc_data;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
struct net_device_stats *stats = slc_get_stats(sl->dev);
-#else
- struct net_device_stats *stats = &sl->dev->stats;
#endif
/* First make sure we're connected. */
if (sl->xleft <= 0) {
/* Now serial buffer is almost free & we can start
* transmission of another packet */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
stats->tx_packets++;
- tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+#else
+ sl->dev->stats.tx_packets++;
+#endif
+ 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 slcan *sl = (struct slcan *) tty->disc_data;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
struct net_device_stats *stats = slc_get_stats(sl->dev);
-#else
- 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 */
while (count--) {
if (fp && *fp++) {
if (!test_and_set_bit(SLF_ERROR, &sl->flags))
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
stats->rx_errors++;
+#else
+ sl->dev->stats.rx_errors++;
+#endif
cp++;
continue;
}
************************************/
/* 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)
{
int i;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
int sel = -1;
int score = -1;
+#endif
struct net_device *dev = NULL;
struct slcan *sl;
if (dev == NULL)
break;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
sl = netdev_priv(dev);
if (sl->leased) {
if (sl->line != line)
sl->flags &= (1 << SLF_INUSE);
return sl;
}
+#endif
}
/* Sorry, too many, all slots in use */
sl = netdev_priv(dev);
/* Initialize channel control data */
- sl->magic = SLCAN_MAGIC;
- sl->dev = dev;
+ sl->magic = SLCAN_MAGIC;
+ sl->dev = dev;
spin_lock_init(&sl->lock);
slcan_devs[i] = 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;
#else
static struct tty_ldisc_ops slc_ldisc = {
#endif
- .owner = THIS_MODULE,
- .magic = TTY_LDISC_MAGIC,
- .name = "slcan",
- .open = slcan_open,
- .close = slcan_close,
+ .owner = THIS_MODULE,
+ .magic = TTY_LDISC_MAGIC,
+ .name = "slcan",
+ .open = slcan_open,
+ .close = slcan_close,
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)
- .hangup = slcan_hangup,
+ .hangup = slcan_hangup,
#endif
.ioctl = slcan_ioctl,
.receive_buf = slcan_receive_buf,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- .receive_room = slcan_receive_room,
+ .receive_room = slcan_receive_room,
#endif
.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