kernel: clean up scheduler default config and kmod-sched kconfig symbols, enable...

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 2bb14e2..04cdb06 100644 (file)
--- 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
@@ -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
@@ -264,6 +301,8 @@ define KernelPackage/ipv6
        CONFIG_IPV6 \
        CONFIG_IPV6_PRIVACY=y \
        CONFIG_IPV6_MULTIPLE_TABLES=y \
+       CONFIG_IPV6_MROUTE=y \
+       CONFIG_IPV6_PIMSM_V2=n \
        CONFIG_IPV6_SUBTREES=y
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
@@ -462,6 +501,7 @@ define KernelPackage/sched
        CONFIG_NET_SCHED=y \
        CONFIG_NET_SCH_DSMARK \
        CONFIG_NET_SCH_ESFQ \
+       CONFIG_NET_SCH_ESFQ_NFCT=y \
        CONFIG_NET_SCH_FIFO \
        CONFIG_NET_SCH_GRED \
        CONFIG_NET_SCH_HFSC \
@@ -470,8 +510,24 @@ define KernelPackage/sched
        CONFIG_NET_SCH_PRIO \
        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 \
+       CONFIG_NET_ACT_POLICE \
+       CONFIG_NET_EMATCH \
+       CONFIG_NET_EMATCH_CMP \
+       CONFIG_NET_EMATCH_NBYTE \
+       CONFIG_NET_EMATCH_U32 \
+       CONFIG_NET_EMATCH_META \
+       CONFIG_NET_EMATCH_TEXT
   FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -485,6 +541,7 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
+  DEPENDS:=kmod-crc16
   KCONFIG:= \
        CONFIG_AX25 \
        CONFIG_MKISS