fix compile of iptunnel4 for the 2.4 kernel

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 25900a5693c1696fe2cf5c7087ac3ff53b41eae9..d207003f8b4f177e6559a3d673a63983a5c743ec 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -71,7 +71,7 @@ define KernelPackage/capi
        $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi capifs)
 endef
 
 define KernelPackage/capi/description
@@ -80,6 +80,40 @@ endef
 
 $(eval $(call KernelPackage,capi))
 
+define KernelPackage/misdn
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=mISDN (ISDN) Support
+  KCONFIG:= \
+       CONFIG_ISDN=y \
+       CONFIG_MISDN \
+       CONFIG_MISDN_DSP \
+       CONFIG_MISDN_L1OIP \
+       CONFIG_ISDN_PPP=N \
+       CONFIG_ISDN_AUDIO=n \
+       CONFIG_ISDN_WITH_ABC=n \
+       CONFIG_ISDN_DRV_LOOP=n \
+       CONFIG_ISDN_DIVERSION=n \
+       CONFIG_ISDN_DRV_HISAX=n \
+       CONFIG_ISDN_DRV_ICN=n \
+       CONFIG_ISDN_DRV_PCBIT=n \
+       CONFIG_ISDN_DRV_SC=n \
+       CONFIG_ISDN_DRV_ACT2000=n \
+       CONFIG_ISDN_DRV_EICON=n \
+       CONFIG_ISDN_DRV_TPAM=n \
+       CONFIG_HYSDN=n
+  FILES:= \
+       $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/isdn/mISDN/l1oip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
+endef
+
+define KernelPackage/misdn/description
+  Modular ISDN driver support
+endef
+
+$(eval $(call KernelPackage,misdn))
+
 
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -182,19 +216,22 @@ endef
 
 $(eval $(call KernelPackage,ipsec6))
 
-
-# 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)
+  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)
 endef
 
 define KernelPackage/iptunnel4/description
@@ -203,7 +240,6 @@ endef
 
 $(eval $(call KernelPackage,iptunnel4))
 
-
 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling