[package] fix isdn4linux kernel modules with the 2.4.37 update

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index b931267cf9b117870e62f2c19f355934f3b16862..789c655e1434a402bc3da500b760445bfdd62fed 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
 
@@ -119,7 +118,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 \
@@ -138,14 +136,26 @@ define KernelPackage/isdn4linux
     CONFIG_ISDN_DRV_LOOP=n \
     CONFIG_ISDN_DRV_PCBIT=n \
     CONFIG_ISDN_DRV_SC=n \
-    CONFIG_HYSDN=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)
+    $(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.$(LINUX_KMOD_SUFFIX) \
+       $(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 +312,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)
@@ -500,6 +512,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,10 +521,9 @@ 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 \
+       CONFIG_NET_CLS_ACT=y \
        CONFIG_NET_CLS_BASIC \
        CONFIG_NET_CLS_FLOW \
        CONFIG_NET_CLS_FW \
@@ -519,7 +531,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 \
+       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