bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied CCAT patch 0001-fix-ccat-netdev-for-v4.11.patch from Beckhoff.

This commit is contained in:
Florian Pose 2018-01-30 17:08:21 +01:00
parent 282e4c7494
commit 77dc73606d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devices/ccat/netdev.c
View File

@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/version.h>
#ifdef CONFIG_PCI
#include <asm/dma.h>
@ -793,8 +794,12 @@ static enum hrtimer_restart poll_timer_callback(struct hrtimer *timer)
return HRTIMER_RESTART;
}
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0))
static struct rtnl_link_stats64 *ccat_eth_get_stats64(struct net_device *dev, struct rtnl_link_stats64
*storage)
#else
static void ccat_eth_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)
#endif
{
struct ccat_eth_priv *const priv = netdev_priv(dev);
struct ccat_mac_register mac;
@ -829,7 +834,9 @@ static struct rtnl_link_stats64 *ccat_eth_get_stats64(struct net_device *dev, st
/* for cslip etc */
//TODO __u64 rx_compressed;
//TODO __u64 tx_compressed;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0))
return storage;
#endif
}
static int ccat_eth_open(struct net_device *dev)