kernel: make most modules use AutoProbe

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

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index e42237ae07ac881d61d3ea1ab3acc3db751a821b..b9e7740d85f3cc38cce1c47ecf6fad2bb6909b44 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -45,6 +45,7 @@ $(eval $(call KernelPackage,atmtcp))
 define KernelPackage/appletalk
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Appletalk protocol support
+  DEPENDS:=+PACKAGE_kmod-llc:kmod-llc
   KCONFIG:= \
        CONFIG_ATALK \
        CONFIG_DEV_APPLETALK \
@@ -100,8 +101,11 @@ define KernelPackage/llc
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ANSI/IEEE 802.2 LLC support
   KCONFIG:=CONFIG_LLC
-  FILES:=$(LINUX_DIR)/net/llc/llc.ko
-  AUTOLOAD:=$(call AutoLoad,09,llc)
+  FILES:= \
+       $(LINUX_DIR)/net/llc/llc.ko \
+       $(LINUX_DIR)/net/802/p8022.ko \
+       $(LINUX_DIR)/net/802/psnap.ko
+  AUTOLOAD:=$(call AutoLoad,09,llc p8022 psnap)
 endef
 
 define KernelPackage/llc/description
@@ -510,19 +514,28 @@ endef
 $(eval $(call KernelPackage,veth))
 
 
+define KernelPackage/slhc
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  HIDDEN:=1
+  TITLE:=Serial Line Header Compression
+  DEPENDS:=+kmod-lib-crc-ccitt
+  KCONFIG:=CONFIG_SLHC
+  FILES:=$(LINUX_DIR)/drivers/net/slip/slhc.ko
+endef
+
+$(eval $(call KernelPackage,slhc))
+
+
 define KernelPackage/ppp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
-  DEPENDS:=+kmod-lib-crc-ccitt
+  DEPENDS:=+kmod-lib-crc-ccitt +kmod-slhc
   KCONFIG:= \
        CONFIG_PPP \
-       CONFIG_PPP_ASYNC \
-       CONFIG_SLHC
+       CONFIG_PPP_ASYNC
   FILES:= \
        $(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \
-       $(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \
-       $(LINUX_DIR)/drivers/net/slip/slhc.ko
-  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
+       $(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko
 endef
 
 define KernelPackage/ppp/description
@@ -554,7 +567,6 @@ define KernelPackage/pppox
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
   FILES:=$(LINUX_DIR)/drivers/net/ppp/pppox.ko
-  AUTOLOAD:=$(call AutoLoad,40,pppox)
 endef
 
 define KernelPackage/pppox/description
@@ -570,7 +582,7 @@ define KernelPackage/pppoe
   DEPENDS:=kmod-ppp +kmod-pppox
   KCONFIG:=CONFIG_PPPOE
   FILES:=$(LINUX_DIR)/drivers/net/ppp/pppoe.ko
-  AUTOLOAD:=$(call AutoLoad,41,pppoe)
+  AUTOLOAD:=$(call AutoProbe,pppoe)
 endef
 
 define KernelPackage/pppoe/description
@@ -602,7 +614,7 @@ define KernelPackage/pptp
   DEPENDS:=kmod-ppp +kmod-gre +kmod-pppox
   KCONFIG:=CONFIG_PPTP
   FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko
-  AUTOLOAD:=$(call AutoLoad,41,pptp)
+  AUTOLOAD:=$(call AutoProbe,pptp)
 endef
 
 $(eval $(call KernelPackage,pptp))
@@ -614,7 +626,7 @@ define KernelPackage/pppol2tp
   DEPENDS:=kmod-ppp +kmod-pppox +kmod-l2tp
   KCONFIG:=CONFIG_PPPOL2TP
   FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko
-  AUTOLOAD:=$(call AutoLoad,41,l2tp_ppp)
+  AUTOLOAD:=$(call AutoProbe,l2tp_ppp)
 endef
 
 define KernelPackage/pppol2tp/description
@@ -630,7 +642,7 @@ define KernelPackage/ipoa
   DEPENDS:=kmod-atm
   KCONFIG:=CONFIG_ATM_CLIP
   FILES:=$(LINUX_DIR)/net/atm/clip.ko
-  AUTOLOAD:=$(call AutoLoad,40,clip)
+  AUTOLOAD:=$(call AutoProbe,clip)
 endef
 
 define KernelPackage/ipoa/description
@@ -648,7 +660,7 @@ define KernelPackage/mppe
        CONFIG_PPP_MPPE_MPPC \
        CONFIG_PPP_MPPE
   FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko
-  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
+  AUTOLOAD:=$(call AutoProbe,ppp_mppe)
 endef
 
 define KernelPackage/mppe/description
@@ -720,7 +732,7 @@ $(eval $(call KernelPackage,sched-esfq))
 define KernelPackage/sched
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Extra traffic schedulers
-  DEPENDS:=+kmod-sched-core
+  DEPENDS:=+kmod-sched-core +kmod-ipt-core
   KCONFIG:= \
        CONFIG_NET_SCH_CODEL \
        CONFIG_NET_SCH_DSMARK \
@@ -879,7 +891,7 @@ define KernelPackage/sctp
      CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
   FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
   AUTOLOAD:= $(call AutoLoad,32,sctp)
-  DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac
+  DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac +IPV6:kmod-ipv6
 endef
 
 define KernelPackage/sctp/description
@@ -906,6 +918,7 @@ $(eval $(call KernelPackage,netem))
 
 define KernelPackage/slip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=+kmod-slhc
   TITLE:=SLIP modules
   KCONFIG:= \
        CONFIG_SLIP \