diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2015-04-23 13:33:43 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-25 14:20:21 +0200 |
| commit | 9f55c4e8b0b0cc4bca00d2c9dd3d5926106fcc6f (patch) | |
| tree | 72d021f78b5667a6b6511cc301efccc4444065b8 /backport | |
| parent | fe2026eaa389d3c62bfb2d26e29f95da792a5303 (diff) | |
backports: add passthru_features_check()
This is required by igb and possibly other network drivers.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
[change to EXPORT_SYMBOL_GPL]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport')
| -rw-r--r-- | backport/backport-include/linux/netdevice.h | 6 | ||||
| -rw-r--r-- | backport/compat/Makefile | 1 | ||||
| -rw-r--r-- | backport/compat/backport-4.1.c | 19 |
3 files changed, 26 insertions, 0 deletions
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index abbfe1d4..ae677715 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -254,4 +254,10 @@ static inline struct sk_buff *napi_alloc_skb(struct napi_struct *napi, #define IFF_TX_SKB_SHARING 0 #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) +netdev_features_t passthru_features_check(struct sk_buff *skb, + struct net_device *dev, + netdev_features_t features); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) */ + #endif /* __BACKPORT_NETDEVICE_H */ diff --git a/backport/compat/Makefile b/backport/compat/Makefile index 3d905edc..f60c32b5 100644 --- a/backport/compat/Makefile +++ b/backport/compat/Makefile @@ -25,6 +25,7 @@ compat-$(CPTCFG_KERNEL_3_15) += backport-3.15.o compat-$(CPTCFG_KERNEL_3_17) += backport-3.17.o compat-$(CPTCFG_KERNEL_3_18) += backport-3.18.o compat-$(CPTCFG_KERNEL_3_19) += backport-3.19.o +compat-$(CPTCFG_KERNEL_4_1) += backport-4.1.o compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o diff --git a/backport/compat/backport-4.1.c b/backport/compat/backport-4.1.c new file mode 100644 index 00000000..d5027bd3 --- /dev/null +++ b/backport/compat/backport-4.1.c @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2015 Stefan Assmann <sassmann@kpanic.de> + * + * Backport functionality introduced in Linux 4.1. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/netdevice.h> + +netdev_features_t passthru_features_check(struct sk_buff *skb, + struct net_device *dev, + netdev_features_t features) +{ + return features; +} +EXPORT_SYMBOL_GPL(passthru_features_check); |