X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/43a4aa2db0da7813be1be99512e39dc06c159e55..6fefa51caeb1d7641f5121a7a6067b911fcd2d0a:/package/kernel/modules/netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 42a182267..53e218d26 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
 
@@ -44,6 +43,29 @@ endef
 $(eval $(call KernelPackage,atmtcp))
 
 
+define KernelPackage/appletalk
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Appletalk protocol support
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:= \
+	CONFIG_ATALK \
+	CONFIG_DEV_APPLETALK \
+	CONFIG_IPDDP \
+	CONFIG_IPDDP_ENCAP=y \
+	CONFIG_IPDDP_DECAP=y
+  FILES:= \
+	$(LINUX_DIR)/net/appletalk/appletalk.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/appletalk/ipddp.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,appletalk ipddp)
+endef
+
+define KernelPackage/appletalk/description
+ Kernel module for AppleTalk protocol.
+endef
+
+$(eval $(call KernelPackage,appletalk))
+
+
 define KernelPackage/bonding
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Ethernet bonding driver
@@ -66,11 +88,12 @@ define KernelPackage/capi
   KCONFIG:= \
 	CONFIG_ISDN_CAPI \
 	CONFIG_ISDN_CAPI_CAPI20 \
-	CONFIG_ISDN_CAPIFS
+	CONFIG_ISDN_CAPIFS \
+	CONFIG_ISDN_CAPI_CAPIFS
   FILES:= \
 	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX)
-	$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
 endef
 
@@ -84,23 +107,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 \
-	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
+	CONFIG_MISDN_L1OIP
   FILES:= \
   	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \
@@ -108,6 +117,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
@@ -119,33 +138,38 @@ 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_CAPI_MIDDLEWARE=y \
+    CONFIG_ISDN_CAPI_CAPIFS_BOOL=y \
     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
+    CONFIG_ISDN_DIVERSION
   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
@@ -175,10 +199,12 @@ define KernelPackage/ipsec
   DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
   KCONFIG:= \
 	CONFIG_NET_KEY \
-	CONFIG_XFRM_USER
+	CONFIG_XFRM_USER \
+	CONFIG_XFRM_IPCOMP
   FILES:= \
 	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/xfrm/xfrm_ipcomp.$(LINUX_KMOD_SUFFIX)
 endef
 
 define KernelPackage/ipsec/description
@@ -302,6 +328,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)
@@ -424,6 +452,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 +477,21 @@ endef
 
 $(eval $(call KernelPackage,pppoa))
 
+define KernelPackage/pppol2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoL2TP support
+  DEPENDS:=kmod-ppp +kmod-pppoe
+  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)
@@ -468,7 +512,7 @@ $(eval $(call KernelPackage,ipoa))
 define KernelPackage/mppe
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Microsoft PPP compression/encryption
-  DEPENDS:=kmod-ppp +kmod-crypto-arc4 +kmod-crypto-sha1
+  DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1
   KCONFIG:= \
 	CONFIG_PPP_MPPE_MPPC \
 	CONFIG_PPP_MPPE
@@ -500,6 +544,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 \
@@ -507,11 +552,11 @@ define KernelPackage/sched
 	CONFIG_NET_SCH_INGRESS \
 	CONFIG_NET_SCH_PRIO \
 	CONFIG_NET_SCH_RED \
-	CONFIG_NET_SCH_SFQ \
 	CONFIG_NET_SCH_TBF \
+	CONFIG_NET_SCH_SFQ \
 	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 +564,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
 
@@ -533,6 +585,7 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
+  DEPENDS:= +kmod-crc16
   KCONFIG:= \
 	CONFIG_AX25 \
 	CONFIG_MKISS