aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-04 23:30:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-04 23:30:36 +0000
commit33beafa8d88e51907acba6fdece5a35f509934df (patch)
treec2fcc27f7a431271857ee553bd55840d5ee83779
parent48a57b1eaddc99c1df778afe07eacd8a204e8829 (diff)
downloadupstream-33beafa8d88e51907acba6fdece5a35f509934df.tar.gz
upstream-33beafa8d88e51907acba6fdece5a35f509934df.tar.bz2
upstream-33beafa8d88e51907acba6fdece5a35f509934df.zip
Configure IPv6 kernel options in config/Config-kernel.in
Revision 46834 changed IPv6 support from a module to builtin. But since the configuration of the IPv6 kernel options was left in package/kernel/linux/modules/netsupport.mk, this means that an empty kmod-ipv6 module was still being generated (not packaged). This patch moves the configuration of the IPv6 kernel options to config/Config-kernel.in to remove this last bit of the module. Note that CONFIG_IPV6_PRIVACY was dropped (enabled by default since Linux v3.13), so this option is no longer needed. See https://github.com/torvalds/linux/commit/5d9efa7ee99eed58388f186c13cf2e2a87e9ceb4 Signed-off-by: Arjen de Korte <arjen+openwrt@de-korte.org> SVN-Revision: 48132
-rw-r--r--config/Config-kernel.in23
-rw-r--r--package/kernel/linux/modules/netsupport.mk22
2 files changed, 23 insertions, 22 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 4be5f53b51..6e79bae34b 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -551,3 +551,26 @@ config KERNEL_SECCOMP
default n
help
Build kernel with support for seccomp.
+
+#
+# IPv6 configuration
+#
+
+config KERNEL_IPV6
+ def_bool IPV6
+
+if KERNEL_IPV6
+
+ config KERNEL_IPV6_MULTIPLE_TABLES
+ def_bool y
+
+ config KERNEL_IPV6_SUBTREES
+ def_bool y
+
+ config KERNEL_IPV6_MROUTE
+ def_bool y
+
+ config KERNEL_IPV6_PIMSM_V2
+ def_bool n
+
+endif
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 2fa87b99d0..e3fa9d7b5a 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -454,28 +454,6 @@ endef
$(eval $(call KernelPackage,iptunnel6))
-define KernelPackage/ipv6
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=IPv6 support
- DEPENDS:=@IPV6
- HIDDEN:=1
- DEFAULT:=y
- KCONFIG:= \
- CONFIG_IPV6=y \
- CONFIG_IPV6_PRIVACY=y \
- CONFIG_IPV6_MULTIPLE_TABLES=y \
- CONFIG_IPV6_MROUTE=y \
- CONFIG_IPV6_PIMSM_V2=n \
- CONFIG_IPV6_SUBTREES=y
-endef
-
-define KernelPackage/ipv6/description
- Kernel modules for IPv6 support
-endef
-
-$(eval $(call KernelPackage,ipv6))
-
-
define KernelPackage/sit
SUBMENU:=$(NETWORK_SUPPORT_MENU)
DEPENDS:=@IPV6 +kmod-iptunnel +kmod-iptunnel4