X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/86b7caafed55a71f6dd2742568a72fe1219854f9..f9f1a967746c940b98080ee24439e795faa826c6:/package/kernel/modules/netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index add802479..58fef4669 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 NETWORK_SUPPORT_MENU:=Network Support
 
@@ -69,9 +68,9 @@ define KernelPackage/capi
 	CONFIG_ISDN_CAPIFS
   FILES:= \
 	$(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 capifs)
+	$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
 endef
 
 define KernelPackage/capi/description
@@ -88,7 +87,7 @@ define KernelPackage/misdn
   	CONFIG_MISDN \
 	CONFIG_MISDN_DSP \
 	CONFIG_MISDN_L1OIP \
-	CONFIG_ISDN_PPP=N \
+	CONFIG_ISDN_PPP=n \
 	CONFIG_ISDN_AUDIO=n \
 	CONFIG_ISDN_WITH_ABC=n \
 	CONFIG_ISDN_DRV_LOOP=n \
@@ -115,6 +114,44 @@ endef
 $(eval $(call KernelPackage,misdn))
 
 
+define KernelPackage/isdn4linux
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Old ISDN4Linux (deprecated)
+  KCONFIG:= \
+    CONFIG_ISDN=y \
+    CONFIG_ISDN_I4L \
+    CONFIG_ISDN_PPP=y \
+    CONFIG_ISDN_PPP_VJ=y \
+    CONFIG_ISDN_MPP=y \
+    CONFIG_IPPP_FILTER=y \
+    CONFIG_ISDN_PPP_BSDCOMP \
+    CONFIG_ISDN_AUDIO=y \
+    CONFIG_ISDN_TTY_FAX=y \
+    CONFIG_ISDN_X25=y \
+    CONFIG_ISDN_DIVERSION \
+    CONFIG_ISDN_CAPI_CAPIDRV=n \
+    CONFIG_ISDN_DRV_ACT2000=n \
+    CONFIG_ISDN_DRV_GIGASET=n \
+    CONFIG_ISDN_DRV_HISAX=n \
+    CONFIG_ISDN_DRV_ICN=n \
+    CONFIG_ISDN_DRV_LOOP=n \
+    CONFIG_ISDN_DRV_PCBIT=n \
+    CONFIG_ISDN_DRV_SC=n \
+    CONFIG_HYSDN=n
+  FILES:= \
+    $(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
+endef
+
+define KernelPackage/isdn4linux/description
+  This driver allows you to use an ISDN adapter for networking
+endef
+
+$(eval $(call KernelPackage,isdn4linux))
+
+
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation
@@ -276,21 +313,12 @@ endef
 $(eval $(call KernelPackage,ipv6))
 
 
+# sit is not selectable on 2.4, but built when ipv6 is enabled
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
-  DEPENDS:=+kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4
   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
@@ -480,7 +508,17 @@ define KernelPackage/sched
 	CONFIG_NET_SCH_RED \
 	CONFIG_NET_SCH_SFQ \
 	CONFIG_NET_SCH_TBF \
-	CONFIG_NET_SCH_TEQL
+	CONFIG_NET_SCH_TEQL \
+	CONFIG_NET_CLS=y \
+	CONFIG_NET_CLS_ACT=y \
+	CONFIG_NET_CLS_BASIC \
+	CONFIG_NET_CLS_FLOW \
+	CONFIG_NET_CLS_FW \
+	CONFIG_NET_CLS_ROUTE4 \
+	CONFIG_NET_CLS_TCINDEX \
+	CONFIG_NET_CLS_U32 \
+	CONFIG_NET_ACT_MIRRED \
+	CONFIG_NET_ACT_IPT
   FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -494,6 +532,7 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
+  DEPENDS:=kmod-crc16
   KCONFIG:= \
 	CONFIG_AX25 \
 	CONFIG_MKISS