diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-19 16:42:16 +0300 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-05-25 23:28:58 +0200 |
commit | c76a48f095f3048a1daa9560eef65da3b8903b1d (patch) | |
tree | ab22dcf4f70df2107e9d5e1a7749526f92ed57d6 | |
parent | 85e8047fa3d05167648a36f72591ecc19947d725 (diff) |
backport: allow compilation with Ubuntu's 3.13
Canonical backported:
Author: Or Gerlitz <ogerlitz@mellanox.com>
Date: Mon Jan 20 13:59:19 2014 +0200
net: Add GRO support for UDP encapsulating protocols
This is commit 2da204a8f67fbe25816cbce8cc8551f03d5b951a in their
tree.
Cope with that.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
[changed bool, it should be build when the kernel version is != 3.13.11]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | backport/backport-include/linux/netdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index bb3fefbf..95189be6 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -81,6 +81,7 @@ static inline void dev_consume_skb_any(struct sk_buff *skb) dev_kfree_skb_any(skb); } +#if (LINUX_VERSION_CODE != KERNEL_VERSION(3,13,11) || UTS_UBUNTU_RELEASE_ABI < 24) struct pcpu_sw_netstats { u64 rx_packets; u64 rx_bytes; @@ -88,6 +89,7 @@ struct pcpu_sw_netstats { u64 tx_bytes; struct u64_stats_sync syncp; }; +#endif #define netdev_tstats(dev) ((struct pcpu_sw_netstats *)dev->ml_priv) #define netdev_assign_tstats(dev, e) dev->ml_priv = (e); |