aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-11-12 22:13:23 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-12-16 22:14:02 +0100
commitb0d7fcdc4951aea64f93600776d8a5a535a2e9cc (patch)
treecd8eaa9402e97fc4e4906773a2162788cbbb3f71
parent876191d428327916d72f4601270de303ddeeddfa (diff)
downloadupstream-b0d7fcdc4951aea64f93600776d8a5a535a2e9cc.tar.gz
upstream-b0d7fcdc4951aea64f93600776d8a5a535a2e9cc.tar.bz2
upstream-b0d7fcdc4951aea64f93600776d8a5a535a2e9cc.zip
kernel: deactivate some new network features
This deactivates the following options which were introduced between kernel 4.9 and 4.14 in some kernel packages: CONFIG_INET_ESP_OFFLOAD CONFIG_INET6_ESP_OFFLOAD CONFIG_LWTUNNEL_BPF CONFIG_NET_9P_XEN Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--package/kernel/linux/modules/netsupport.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index e4740428af..178a00a3ee 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -271,7 +271,8 @@ define KernelPackage/ipsec4
CONFIG_INET_XFRM_MODE_BEET \
CONFIG_INET_XFRM_MODE_TRANSPORT \
CONFIG_INET_XFRM_MODE_TUNNEL \
- CONFIG_INET_XFRM_TUNNEL
+ CONFIG_INET_XFRM_TUNNEL \
+ CONFIG_INET_ESP_OFFLOAD=n
FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
endef
@@ -311,7 +312,8 @@ define KernelPackage/ipsec6
CONFIG_INET6_XFRM_MODE_BEET \
CONFIG_INET6_XFRM_MODE_TRANSPORT \
CONFIG_INET6_XFRM_MODE_TUNNEL \
- CONFIG_INET6_XFRM_TUNNEL
+ CONFIG_INET6_XFRM_TUNNEL \
+ CONFIG_INET6_ESP_OFFLOAD=n
FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
endef
@@ -942,6 +944,7 @@ define KernelPackage/mpls
KCONFIG:= \
CONFIG_MPLS=y \
CONFIG_LWTUNNEL=y \
+ CONFIG_LWTUNNEL_BPF=n \
CONFIG_NET_MPLS_GSO=m \
CONFIG_MPLS_ROUTING=m \
CONFIG_MPLS_IPTUNNEL=m
@@ -965,6 +968,7 @@ define KernelPackage/9pnet
KCONFIG:= \
CONFIG_NET_9P \
CONFIG_NET_9P_DEBUG=n \
+ CONFIG_NET_9P_XEN=n \
CONFIG_NET_9P_VIRTIO
FILES:= \
$(LINUX_DIR)/net/9p/9pnet.ko \