X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetsupport.mk;h=d207003f8b4f177e6559a3d673a63983a5c743ec;hb=46b049334427f671e74d631d00cf11161ff12a80;hp=4e75a9c274717e3d24597b7633c384c4eb971408;hpb=4dbfa86fb54570f1e5e30d1ec0cc57f550fe990c;p=openwrt-10.03%2F.git

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 4e75a9c27..d207003f8 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -87,7 +87,20 @@ define KernelPackage/misdn
   	CONFIG_ISDN=y \
   	CONFIG_MISDN \
 	CONFIG_MISDN_DSP \
-	CONFIG_MISDN_L1OIP
+	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) \
@@ -203,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
@@ -224,7 +240,6 @@ endef
 
 $(eval $(call KernelPackage,iptunnel4))
 
-
 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling