[package] fix kmod-nls-base dependency with usb-core (#6753)

[openwrt.git] / package / kernel / modules / netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 9e9cdcb..de04478 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -88,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
 
@@ -108,19 +109,7 @@ define KernelPackage/misdn
   KCONFIG:= \
        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) \
@@ -155,19 +144,12 @@ define KernelPackage/isdn4linux
     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)
   AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
@@ -211,28 +193,43 @@ 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
   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_XFRM_IPCOMP
+  FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  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)
@@ -245,9 +242,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).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
 endef
 
 define KernelPackage/ipsec4/description
@@ -265,6 +261,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)
@@ -277,9 +282,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).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
 endef
 
 define KernelPackage/ipsec6/description
@@ -305,9 +309,7 @@ define KernelPackage/iptunnel4
   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.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel4)
 endef
 
@@ -324,9 +326,7 @@ define KernelPackage/iptunnel6
   DEPENDS:= @LINUX_2_6 +kmod-ipv6
   KCONFIG:= \
        CONFIG_INET6_TUNNEL
-  FILES:= $(foreach mod,tunnel6, \
-       $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel6)
 endef
 
@@ -568,6 +568,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 \
@@ -600,7 +601,6 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
-  DEPENDS:= +kmod-crc16
   KCONFIG:= \
        CONFIG_AX25 \
        CONFIG_MKISS
@@ -608,6 +608,7 @@ define KernelPackage/ax25
        $(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
+  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/ax25/description