From f0fa84c67d817c1a1380fdb3b1ffc75f9e113d70 Mon Sep 17 00:00:00 2001 From: hartkopp Date: Wed, 23 Sep 2009 18:03:35 +0000 Subject: [PATCH] Fix kernel version depency from commit rev 1060 git-svn-id: svn://svn.berlios.de//socketcan/trunk@1063 030b6a49-0b11-0410-94ab-b0dab22257f2 --- kernel/2.6/drivers/net/can/at91_can.c | 10 +++++----- kernel/2.6/drivers/net/can/dev.c | 2 +- kernel/2.6/drivers/net/can/esd_pci331.c | 6 +++--- kernel/2.6/drivers/net/can/mcp251x.c | 2 +- kernel/2.6/drivers/net/can/slcan.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/2.6/drivers/net/can/at91_can.c b/kernel/2.6/drivers/net/can/at91_can.c index 35aa90c..0b6e983 100644 --- a/kernel/2.6/drivers/net/can/at91_can.c +++ b/kernel/2.6/drivers/net/can/at91_can.c @@ -357,7 +357,7 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state) * (mb - AT91_MB_TX_FIRST); * */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) static int at91_start_xmit(struct sk_buff *skb, struct net_device *dev) #else static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev) @@ -473,7 +473,7 @@ static void at91_rx_overflow_err(struct net_device *dev) netif_receive_skb(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif stats->rx_packets++; @@ -536,7 +536,7 @@ static void at91_read_msg(struct net_device *dev, unsigned int mb) at91_read_mb(dev, mb, cf); netif_receive_skb(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif stats->rx_packets++; @@ -692,7 +692,7 @@ static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr) at91_poll_err_frame(dev, cf, reg_sr); netif_receive_skb(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif dev->stats.rx_packets++; @@ -931,7 +931,7 @@ static void at91_irq_err(struct net_device *dev) at91_irq_err_state(dev, cf, new_state); netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif dev->stats.rx_packets++; diff --git a/kernel/2.6/drivers/net/can/dev.c b/kernel/2.6/drivers/net/can/dev.c index fd3d06e..111e7a9 100644 --- a/kernel/2.6/drivers/net/can/dev.c +++ b/kernel/2.6/drivers/net/can/dev.c @@ -411,7 +411,7 @@ void can_restart(unsigned long data) netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif stats->rx_packets++; diff --git a/kernel/2.6/drivers/net/can/esd_pci331.c b/kernel/2.6/drivers/net/can/esd_pci331.c index 5fe879d..d19578c 100644 --- a/kernel/2.6/drivers/net/can/esd_pci331.c +++ b/kernel/2.6/drivers/net/can/esd_pci331.c @@ -460,7 +460,7 @@ static int esd331_create_err_frame(struct net_device *dev, canid_t idflags, netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif stats->rx_packets++; @@ -513,7 +513,7 @@ static void esd331_irq_rx(struct net_device *dev, struct esd331_can_msg *msg, netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) dev->last_rx = jiffies; #endif stats->rx_packets++; @@ -692,7 +692,7 @@ static int esd331_close(struct net_device *dev) return 0; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) static int esd331_start_xmit(struct sk_buff *skb, struct net_device *dev) #else static netdev_tx_t esd331_start_xmit(struct sk_buff *skb, diff --git a/kernel/2.6/drivers/net/can/mcp251x.c b/kernel/2.6/drivers/net/can/mcp251x.c index b08c923..3f92d17 100644 --- a/kernel/2.6/drivers/net/can/mcp251x.c +++ b/kernel/2.6/drivers/net/can/mcp251x.c @@ -483,7 +483,7 @@ static void mcp251x_hw_wakeup(struct spi_device *spi) dev_err(&spi->dev, "MCP251x didn't wake-up\n"); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) static int mcp251x_hard_start_xmit(struct sk_buff *skb, struct net_device *net) #else static netdev_tx_t mcp251x_hard_start_xmit(struct sk_buff *skb, diff --git a/kernel/2.6/drivers/net/can/slcan.c b/kernel/2.6/drivers/net/can/slcan.c index 0f1aa2d..51c748e 100644 --- a/kernel/2.6/drivers/net/can/slcan.c +++ b/kernel/2.6/drivers/net/can/slcan.c @@ -301,7 +301,7 @@ static void slc_bump(struct slcan *sl) &cf, sizeof(struct can_frame)); netif_rx(skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) sl->dev->last_rx = jiffies; #endif stats->rx_packets++; @@ -470,7 +470,7 @@ out: ******************************************/ /* Send a can_frame to a TTY queue. */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32) static int slc_xmit(struct sk_buff *skb, struct net_device *dev) #else static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev) -- 2.39.2