[kernel] update to 2.6.28.4

[openwrt.git] / package / kernel / modules / netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index d207003..73c8b02 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -118,10 +118,10 @@ $(eval $(call KernelPackage,misdn))
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation

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

   KCONFIG:=CONFIG_NET_IPIP
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_NET_IPIP
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,ipip)
+  AUTOLOAD:=$(call AutoLoad,32,ipip)

 endef
 
 define KernelPackage/ipip/description
 endef
 
 define KernelPackage/ipip/description


@@ -216,22 +216,19 @@ endef
 
 $(eval $(call KernelPackage,ipsec6))
 
 
 $(eval $(call KernelPackage,ipsec6))
 

-define KernelPackage/iptunnel4
-  TITLE:=IP in IP encapsulation support
-  KCONFIG:=$(CONFIG_NET_IPIP)
-  SUBMENU:=$(NSMENU)
-endef
-
-define KernelPackage/iptunnel4/2.4
-  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ipip)
-endef

 
 

-define KernelPackage/iptunnel4/2.6
-  FILES:= \
-       $(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
+# NOTE: tunnel4 is not selectable by itself, so enable ipip for that
+define KernelPackage/iptunnel4
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv4 tunneling
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:= \
+       CONFIG_NET_IPIP \
+       CONFIG_INET_TUNNEL
+  FILES:= $(foreach mod,tunnel4, \
+       $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+  )
+  AUTOLOAD:=$(call AutoLoad,31,tunnel4)

 endef
 
 define KernelPackage/iptunnel4/description
 endef
 
 define KernelPackage/iptunnel4/description


@@ -240,6 +237,7 @@ endef
 
 $(eval $(call KernelPackage,iptunnel4))
 
 
 $(eval $(call KernelPackage,iptunnel4))
 

+

 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling
 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling


@@ -278,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