X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ca341a66db5ca390f55901056cb08c8e3435cba4..91c21e1b4de87a180a1771db35c6445c7d763f49:/package/kernel/modules/netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index c58dfcb3a..196e5a39c 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -10,13 +10,12 @@ NETWORK_SUPPORT_MENU:=Network Support
 define KernelPackage/atm
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM support
-  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_ATM \
 	CONFIG_ATM_BR2684
   FILES:= \
-	$(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/atm/atm.ko \
+	$(LINUX_DIR)/net/atm/br2684.ko
   AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef
 
@@ -30,9 +29,9 @@ $(eval $(call KernelPackage,atm))
 define KernelPackage/atmtcp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM over TCP
-  DEPENDS:=@LINUX_2_6 kmod-atm
+  DEPENDS:=kmod-atm
   KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
-  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.ko
   AUTOLOAD:=$(call AutoLoad,40,atmtcp)
 endef
 
@@ -43,11 +42,33 @@ endef
 $(eval $(call KernelPackage,atmtcp))
 
 
+define KernelPackage/appletalk
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Appletalk protocol support
+  KCONFIG:= \
+	CONFIG_ATALK \
+	CONFIG_DEV_APPLETALK \
+	CONFIG_IPDDP \
+	CONFIG_IPDDP_ENCAP=y \
+	CONFIG_IPDDP_DECAP=y
+  FILES:= \
+	$(LINUX_DIR)/net/appletalk/appletalk.ko \
+	$(LINUX_DIR)/drivers/net/appletalk/ipddp.ko
+  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
   KCONFIG:=CONFIG_BONDING
-  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.ko
   AUTOLOAD:=$(call AutoLoad,40,bonding)
 endef
 
@@ -61,15 +82,15 @@ $(eval $(call KernelPackage,bonding))
 define KernelPackage/capi
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=CAPI (ISDN) Support
-  DEPENDS:=@LINUX_2_6
   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/kernelcapi.ko \
+	$(LINUX_DIR)/drivers/isdn/capi/capifs.ko \
+	$(LINUX_DIR)/drivers/isdn/capi/capi.ko
   AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
 endef
 
@@ -83,38 +104,17 @@ 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_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) \
-	$(LINUX_DIR)/drivers/isdn/mISDN/l1oip.$(LINUX_KMOD_SUFFIX)
+  	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.ko \
+	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.ko \
+	$(LINUX_DIR)/drivers/isdn/mISDN/l1oip.ko
   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
@@ -126,45 +126,26 @@ 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/divert/dss1_divert.$(LINUX_KMOD_SUFFIX)
+    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.ko \
+	$(LINUX_DIR)/drivers/isdn/i4l/isdn.ko \
+	$(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.ko
   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,9 +156,9 @@ $(eval $(call KernelPackage,isdn4linux))
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation
-  DEPENDS:=+LINUX_2_6:kmod-iptunnel4
+  DEPENDS:=+kmod-iptunnel4
   KCONFIG:=CONFIG_NET_IPIP
-  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ipv4/ipip.ko
   AUTOLOAD:=$(call AutoLoad,32,ipip)
 endef
 
@@ -188,28 +169,44 @@ endef
 $(eval $(call KernelPackage,ipip))
 
 
+IPSEC-m:= \
+	key/af_key \
+	xfrm/xfrm_ipcomp \
+	xfrm/xfrm_user \
+
 define KernelPackage/ipsec
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4 and IPv6)
-  DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
   KCONFIG:= \
 	CONFIG_NET_KEY \
-	CONFIG_XFRM_USER
-  FILES:= \
-	$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
+	CONFIG_XFRM_USER \
+	CONFIG_INET_IPCOMP \
+	CONFIG_XFRM_IPCOMP
+  FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,30,$(notdir $(IPSEC-m)))
 endef
 
 define KernelPackage/ipsec/description
  Kernel modules for IPsec support in both IPv4 and IPv6.
  Includes:
  - af_key
+ - xfrm_ipcomp
  - xfrm_user
 endef
 
 $(eval $(call KernelPackage,ipsec))
 
 
+IPSEC4-m:= \
+	ipv4/ah4 \
+	ipv4/esp4 \
+	ipv4/xfrm4_mode_beet \
+	ipv4/xfrm4_mode_transport \
+	ipv4/xfrm4_mode_tunnel \
+	ipv4/xfrm4_tunnel \
+	ipv4/ipcomp \
+
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
@@ -222,9 +219,8 @@ define KernelPackage/ipsec4
 	CONFIG_INET_XFRM_MODE_TRANSPORT \
 	CONFIG_INET_XFRM_MODE_TUNNEL \
 	CONFIG_INET_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_mode_beet xfrm4_mode_transport xfrm4_mode_tunnel xfrm4_tunnel , \
-	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
 endef
 
 define KernelPackage/ipsec4/description
@@ -242,6 +238,15 @@ endef
 $(eval $(call KernelPackage,ipsec4))
 
 
+IPSEC6-m:= \
+	ipv6/ah6 \
+	ipv6/esp6 \
+	ipv6/xfrm6_mode_beet \
+	ipv6/xfrm6_mode_transport \
+	ipv6/xfrm6_mode_tunnel \
+	ipv6/xfrm6_tunnel \
+	ipv6/ipcomp6 \
+
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
@@ -254,9 +259,8 @@ define KernelPackage/ipsec6
 	CONFIG_INET6_XFRM_MODE_TRANSPORT \
 	CONFIG_INET6_XFRM_MODE_TUNNEL \
 	CONFIG_INET6_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_mode_beet xfrm6_mode_transport xfrm6_mode_tunnel xfrm6_tunnel, \
-	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
 endef
 
 define KernelPackage/ipsec6/description
@@ -278,13 +282,10 @@ $(eval $(call KernelPackage,ipsec6))
 define KernelPackage/iptunnel4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv4 tunneling
-  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_NET_IPIP \
 	CONFIG_INET_TUNNEL
-  FILES:= $(foreach mod,tunnel4, \
-	$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.ko
   AUTOLOAD:=$(call AutoLoad,31,tunnel4)
 endef
 
@@ -298,12 +299,10 @@ $(eval $(call KernelPackage,iptunnel4))
 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling
-  DEPENDS:= @LINUX_2_6 +kmod-ipv6
+  DEPENDS:= +kmod-ipv6
   KCONFIG:= \
 	CONFIG_INET6_TUNNEL
-  FILES:= $(foreach mod,tunnel6, \
-	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.ko
   AUTOLOAD:=$(call AutoLoad,31,tunnel6)
 endef
 
@@ -324,7 +323,7 @@ define KernelPackage/ipv6
 	CONFIG_IPV6_MROUTE=y \
 	CONFIG_IPV6_PIMSM_V2=n \
 	CONFIG_IPV6_SUBTREES=y
-  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ipv6/ipv6.ko
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef
 
@@ -335,13 +334,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-ipv6 +LINUX_2_6:kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +kmod-iptunnel4
   TITLE:=IPv6-in-IPv4 tunnelling
   KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT
-  FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ipv6/sit.ko
   AUTOLOAD:=$(call AutoLoad,32,sit)
 endef
 
@@ -355,10 +353,10 @@ $(eval $(call KernelPackage,sit))
 define KernelPackage/ip6-tunnel
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IPv6 tunnelling
-  DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel6
+  DEPENDS:= +kmod-ipv6 +kmod-iptunnel6
   KCONFIG:= CONFIG_IPV6_TUNNEL
   FILES:= $(foreach mod,ip6_tunnel, \
-	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/net/ipv6/$(mod).ko \
   )
   AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel)
 endef
@@ -374,7 +372,7 @@ define KernelPackage/gre
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=GRE support
   KCONFIG:=CONFIG_NET_IPGRE
-  FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
+  FILES=$(LINUX_DIR)/net/ipv4/ip_gre.ko
 endef
 
 define KernelPackage/gre/description
@@ -388,7 +386,7 @@ define KernelPackage/tun
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Universal TUN/TAP driver
   KCONFIG:=CONFIG_TUN
-  FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/tun.ko
   AUTOLOAD:=$(call AutoLoad,30,tun)
 endef
 
@@ -402,15 +400,15 @@ $(eval $(call KernelPackage,tun))
 define KernelPackage/ppp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
-  DEPENDS:=+LINUX_2_6:kmod-crc-ccitt
+  DEPENDS:=+kmod-crc-ccitt
   KCONFIG:= \
 	CONFIG_PPP \
 	CONFIG_PPP_ASYNC \
 	CONFIG_SLHC
   FILES:= \
-	$(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/slhc.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/ppp_async.ko \
+	$(LINUX_DIR)/drivers/net/ppp_generic.ko \
+	$(LINUX_DIR)/drivers/net/slhc.ko
   AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 
@@ -426,7 +424,7 @@ define KernelPackage/ppp-synctty
   TITLE:=PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko
   AUTOLOAD:=$(call AutoLoad,40,ppp_synctty)
 endef
 
@@ -443,8 +441,8 @@ define KernelPackage/pppoe
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
   FILES:= \
-	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/pppoe.ko \
+	$(LINUX_DIR)/drivers/net/pppox.ko
   AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
 endef
 
@@ -460,7 +458,7 @@ define KernelPackage/pppoa
   TITLE:=PPPoA support
   DEPENDS:=kmod-ppp +kmod-atm
   KCONFIG:=CONFIG_PPPOATM CONFIG_ATM_DRIVERS=y
-  FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/atm/pppoatm.ko
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
 endef
 
@@ -473,9 +471,9 @@ $(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
+  DEPENDS:=kmod-ppp +kmod-pppoe
   KCONFIG:=CONFIG_PPPOL2TP
-  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko
   AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
 endef
 
@@ -491,7 +489,7 @@ define KernelPackage/ipoa
   TITLE:=IPoA support
   DEPENDS:=kmod-atm
   KCONFIG:=CONFIG_ATM_CLIP
-  FILES:=$(LINUX_DIR)/net/atm/clip.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/atm/clip.ko
   AUTOLOAD:=$(call AutoLoad,40,clip)
 endef
 
@@ -505,21 +503,11 @@ $(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
-endef
-
-define KernelPackage/mppe/2.4
-#  KCONFIG:=CONFIG_PPP_MPPE_MPPC
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
-endef
-
-define KernelPackage/mppe/2.6
-#  KCONFIG:=CONFIG_PPP_MPPE
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
 
@@ -545,6 +533,7 @@ define KernelPackage/sched
 	CONFIG_NET_SCH_INGRESS \
 	CONFIG_NET_SCH_PRIO \
 	CONFIG_NET_SCH_RED \
+	CONFIG_NET_SCH_TBF \
 	CONFIG_NET_SCH_SFQ \
 	CONFIG_NET_SCH_TEQL \
 	CONFIG_NET_CLS=y \
@@ -564,7 +553,7 @@ define KernelPackage/sched
 	CONFIG_NET_EMATCH_U32 \
 	CONFIG_NET_EMATCH_META \
 	CONFIG_NET_EMATCH_TEXT
-  FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/sched/*.ko
 endef
 
 define KernelPackage/sched/description
@@ -577,14 +566,14 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
-  DEPENDS:=kmod-crc16
   KCONFIG:= \
 	CONFIG_AX25 \
 	CONFIG_MKISS
   FILES:= \
-	$(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/ax25/ax25.ko \
+	$(LINUX_DIR)/drivers/net/hamradio/mkiss.ko
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
+  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/ax25/description
@@ -597,17 +586,16 @@ $(eval $(call KernelPackage,ax25))
 define KernelPackage/mp-alg
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ECMP caching algorithms
-  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
 	CONFIG_IP_ROUTE_MULTIPATH_RR \
 	CONFIG_IP_ROUTE_MULTIPATH_RANDOM \
 	CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \
 	CONFIG_IP_ROUTE_MULTIPATH_DRR
   FILES:= \
-	$(LINUX_DIR)/net/ipv4/multipath_rr.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/ipv4/multipath_random.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/ipv4/multipath_wrandom.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/ipv4/multipath_drr.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/net/ipv4/multipath_rr.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_random.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_wrandom.ko \
+	$(LINUX_DIR)/net/ipv4/multipath_drr.ko
   AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
 endef
 
@@ -625,9 +613,8 @@ $(eval $(call KernelPackage,mp-alg))
 define KernelPackage/pktgen
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Network packet generator
-  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_NET_PKTGEN
-  FILES:=$(LINUX_DIR)/net/core/pktgen.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/core/pktgen.ko
   AUTOLOAD:=$(call AutoLoad,99,pktgen)
 endef
 
@@ -637,3 +624,53 @@ endef
 
 $(eval $(call KernelPackage,pktgen))
 
+define KernelPackage/l2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=@LINUX_2_6_35
+  TITLE:=L2TPv3 Support
+  KCONFIG:=CONFIG_L2TP CONFIG_L2TP_DEBUGFS=n
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,32,l2tp_core)
+endef
+
+define KernelPackage/l2tp/description
+ Kernel modules for L2TP V3 Support
+endef
+
+$(eval $(call KernelPackage,l2tp))
+
+define KernelPackage/l2tp-eth
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=L2TP ethernet pseudowire support for L2TPv3
+  DEPENDS:=+kmod-l2tp
+  KCONFIG:= CONFIG_L2TP_V3=y \
+  CONFIG_L2TP_ETH
+  FILES:= \
+	  $(LINUX_DIR)/net/l2tp/l2tp_netlink.$(LINUX_KMOD_SUFFIX) \
+	  $(LINUX_DIR)/net/l2tp/l2tp_eth.$(LINUX_KMOD_SUFFIX) 
+  AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink l2tp_eth)
+endef
+
+define KernelPackage/l2tp-eth/description
+ Kernel modules for L2TP V3 pseudowire support
+endef
+
+$(eval $(call KernelPackage,l2tp-eth))
+
+define KernelPackage/l2tp-ip
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Support for L2TP-over-IP socket family
+  DEPENDS:=+kmod-l2tp
+  KCONFIG:= CONFIG_L2TP_V3=y \
+  CONFIG_L2TP_IP
+  FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_ip)
+endef
+
+define KernelPackage/l2tp-ip/description
+ Kernel modules for L2TP-over-IP socket family
+endef
+
+$(eval $(call KernelPackage,l2tp-ip))
+
+