usb-core: Add dependency to nls-base (#5973)

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index afe6b62fa4ef95d74a105b61362db14ceabd2d89..78d77f0b143128bce0d847ed84343d94df168d53 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -83,11 +83,9 @@ 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 \
@@ -107,6 +105,16 @@ define KernelPackage/misdn
   AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
 endef
 
+define KernelPackage/misdn/2.4
+  KCONFIG+= \
+       CONFIG_ISDN
+endef
+
+define KernelPackage/misdn/2.6
+   KCONFIG+= \
+       CONFIG_ISDN=y
+endef
+
 define KernelPackage/misdn/description
   Modular ISDN driver support
 endef
@@ -118,7 +126,6 @@ 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 \
@@ -139,12 +146,25 @@ define KernelPackage/isdn4linux
     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/2.4
+  KCONFIG+= \
+       CONFIG_ISDN
+  FILES+= \
+       $(LINUX_DIR)/drivers/isdn/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/isdn4linux/2.6
+  KCONFIG+= \
+       CONFIG_ISDN=y
+  FILES+= \
+       $(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
+endef
+
 define KernelPackage/isdn4linux/description
   This driver allows you to use an ISDN adapter for networking
 endef
@@ -302,6 +322,7 @@ define KernelPackage/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)
@@ -424,6 +445,7 @@ define KernelPackage/pppoe
   FILES:= \
        $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
 endef
 
 define KernelPackage/pppoe/description
@@ -448,6 +470,21 @@ endef
 
 $(eval $(call KernelPackage,pppoa))
 
+define KernelPackage/pppol2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoL2TP support
+  DEPENDS:=kmod-ppp +kmod-pppoe @!LINUX_2_6_21||!LINUX_2_6_25||!LINUX_2_6_27
+  KCONFIG:=CONFIG_PPPOL2TP
+  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
+endef
+
+define KernelPackage/pppol2tp/description
+  Kernel modules for PPPoL2TP (PPP over L2TP) support
+endef
+
+$(eval $(call KernelPackage,pppol2tp))
+
 
 define KernelPackage/ipoa
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -500,6 +537,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 \
@@ -508,7 +546,6 @@ 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_CLS=y \
        CONFIG_NET_CLS_ACT=y \
@@ -519,7 +556,14 @@ define KernelPackage/sched
        CONFIG_NET_CLS_TCINDEX \
        CONFIG_NET_CLS_U32 \
        CONFIG_NET_ACT_MIRRED \
-       CONFIG_NET_ACT_IPT
+       CONFIG_NET_ACT_IPT \
+       CONFIG_NET_ACT_POLICE \
+       CONFIG_NET_EMATCH=y \
+       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