fix kmod-sit dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14222 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index add8024..73c8b02 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -276,21 +276,12 @@ endef
 $(eval $(call KernelPackage,ipv6))
 
 
 $(eval $(call KernelPackage,ipv6))
 
 

+# sit is not selectable on 2.4, but built when ipv6 is enabled

 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)

-  DEPENDS:=+kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4

   TITLE:=IPv6-in-IPv4 tunnelling
   TITLE:=IPv6-in-IPv4 tunnelling

-endef
-
-# sit is compiled in the 2.4 ipv6 stack
-define KernelPackage/sit/2.4
-  DEPENDS:= @LINUX_2_4 +kmod-ipv6
-  KCONFIG:=CONFIG_IPV6
-endef
-
-define KernelPackage/sit/2.6
-  DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel4
-  KCONFIG+=CONFIG_IPV6_SIT
+  KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT

   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,32,sit)
 endef
   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,32,sit)
 endef