X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetsupport.mk;h=78d77f0b143128bce0d847ed84343d94df168d53;hb=79973cfaa7f3244515a37ab2908f4a2c60d76960;hp=789c655e1434a402bc3da500b760445bfdd62fed;hpb=fc5ad602888f7843a8cc4d079d6ed98c1cc95467;p=openwrt%2Fopenwrt.git

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 789c655e14..78d77f0b14 100644
--- 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
@@ -136,21 +144,22 @@ 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/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
+  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
+  KCONFIG+= \
+	CONFIG_ISDN=y
   FILES+= \
 	$(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
@@ -436,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
@@ -460,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)
@@ -533,7 +558,7 @@ define KernelPackage/sched
 	CONFIG_NET_ACT_MIRRED \
 	CONFIG_NET_ACT_IPT \
 	CONFIG_NET_ACT_POLICE \
-	CONFIG_NET_EMATCH \
+	CONFIG_NET_EMATCH=y \
 	CONFIG_NET_EMATCH_CMP \
 	CONFIG_NET_EMATCH_NBYTE \
 	CONFIG_NET_EMATCH_U32 \