X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetsupport.mk;h=d893c1add745d07d957e15dc9adcc391d6c16457;hb=cdc7e3eae9be4f957eb4922fa130d0117b6442a8;hp=effd6930fdc894ab7d0711b32427a8244c496107;hpb=f0cf49ce57e0dffa74216526a2bcd1f443500250;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index effd6930fd..d893c1add7 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -79,6 +79,68 @@ endef $(eval $(call KernelPackage,bonding)) +define KernelPackage/bridge + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Ethernet bridging support + DEPENDS:=+kmod-stp + KCONFIG:= \ + CONFIG_BRIDGE \ + CONFIG_BRIDGE_IGMP_SNOOPING=y + FILES:=$(LINUX_DIR)/net/bridge/bridge.ko + AUTOLOAD:=$(call AutoLoad,11,bridge) +endef + +define KernelPackage/bridge/description + Kernel module for Ethernet bridging. +endef + +$(eval $(call KernelPackage,bridge)) + +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) +endef + +define KernelPackage/llc/description + Kernel module for ANSI/IEEE 802.2 LLC support. +endef + +$(eval $(call KernelPackage,llc)) + +define KernelPackage/stp + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Ethernet Spanning Tree Protocol support + DEPENDS:=+kmod-llc + KCONFIG:=CONFIG_STP + FILES:=$(LINUX_DIR)/net/802/stp.ko + AUTOLOAD:=$(call AutoLoad,10,stp) +endef + +define KernelPackage/stp/description + Kernel module for Ethernet Spanning Tree Protocol support. +endef + +$(eval $(call KernelPackage,stp)) + +define KernelPackage/8021q + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=802.1Q VLAN support + KCONFIG:=CONFIG_VLAN_8021Q \ + CONFIG_VLAN_8021Q_GVRP=n + FILES:=$(LINUX_DIR)/net/8021q/8021q.ko + AUTOLOAD:=$(call AutoLoad,12,8021q) +endef + +define KernelPackage/8021q/description + Kernel module for 802.1Q VLAN support +endef + +$(eval $(call KernelPackage,8021q)) + + define KernelPackage/capi SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=CAPI (ISDN) Support @@ -89,9 +151,8 @@ define KernelPackage/capi CONFIG_ISDN_CAPI_CAPIFS FILES:= \ $(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) + AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) endef define KernelPackage/capi/description @@ -170,14 +231,15 @@ $(eval $(call KernelPackage,ipip)) IPSEC-m:= \ - key/af_key \ + $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \ xfrm/xfrm_ipcomp \ xfrm/xfrm_user \ + key/af_key \ define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4 and IPv6) - DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 + DEPENDS:=+kmod-crypto-authenc +kmod-crypto-iv +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 +kmod-crypto-deflate +kmod-crypto-cbc KCONFIG:= \ CONFIG_NET_KEY \ CONFIG_XFRM_USER \ @@ -228,7 +290,7 @@ define KernelPackage/ipsec4/description Includes: - ah4 - esp4 - - ipcomp + - ipcomp4 - xfrm4_mode_beet - xfrm4_mode_transport - xfrm4_mode_tunnel @@ -337,8 +399,9 @@ $(eval $(call KernelPackage,ipv6)) define KernelPackage/sit SUBMENU:=$(NETWORK_SUPPORT_MENU) DEPENDS:=+kmod-ipv6 +kmod-iptunnel4 - TITLE:=IPv6-in-IPv4 tunnelling - KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT + TITLE:=IPv6-in-IPv4 tunnel + KCONFIG:=CONFIG_IPV6_SIT \ + CONFIG_IPV6_SIT_6RD=y FILES:=$(LINUX_DIR)/net/ipv6/sit.ko AUTOLOAD:=$(call AutoLoad,32,sit) endef @@ -355,9 +418,7 @@ define KernelPackage/ip6-tunnel TITLE:=IP-in-IPv6 tunnelling DEPENDS:= +kmod-ipv6 +kmod-iptunnel6 KCONFIG:= CONFIG_IPV6_TUNNEL - FILES:= $(foreach mod,ip6_tunnel, \ - $(LINUX_DIR)/net/ipv6/$(mod).ko \ - ) + FILES:=$(LINUX_DIR)/net/ipv6/ip6_tunnel.ko AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel) endef @@ -371,8 +432,10 @@ $(eval $(call KernelPackage,ip6-tunnel)) define KernelPackage/gre SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=GRE support - KCONFIG:=CONFIG_NET_IPGRE - FILES=$(LINUX_DIR)/net/ipv4/ip_gre.ko + DEPENDS:=+PACKAGE_kmod-ipv6:kmod-ipv6 + KCONFIG:=CONFIG_NET_IPGRE CONFIG_NET_IPGRE_DEMUX + FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko $(LINUX_DIR)/net/ipv4/gre.ko + AUTOLOAD:=$(call AutoLoad,39,gre ip_gre) endef define KernelPackage/gre/description @@ -382,6 +445,22 @@ endef $(eval $(call KernelPackage,gre)) +define KernelPackage/gre6 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=GRE support over IPV6 + DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6 + KCONFIG:=CONFIG_IPV6_GRE + FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko + AUTOLOAD:=$(call AutoLoad,39,ip6_gre) +endef + +define KernelPackage/gre6/description + Generic Routing Encapsulation support over IPv6 +endef + +$(eval $(call KernelPackage,gre6)) + + define KernelPackage/tun SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Universal TUN/TAP driver @@ -400,15 +479,15 @@ $(eval $(call KernelPackage,tun)) define KernelPackage/ppp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPP modules - DEPENDS:=+kmod-crc-ccitt + DEPENDS:=+kmod-lib-crc-ccitt KCONFIG:= \ CONFIG_PPP \ CONFIG_PPP_ASYNC \ CONFIG_SLHC FILES:= \ - $(LINUX_DIR)/drivers/net/ppp_async.ko \ - $(LINUX_DIR)/drivers/net/ppp_generic.ko \ - $(LINUX_DIR)/drivers/net/slhc.ko + $(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) endef @@ -424,7 +503,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.ko + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko AUTOLOAD:=$(call AutoLoad,40,ppp_synctty) endef @@ -435,19 +514,33 @@ endef $(eval $(call KernelPackage,ppp-synctty)) +define KernelPackage/pppox + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=PPPoX helper + DEPENDS:=kmod-ppp + KCONFIG:=CONFIG_PPPOE + FILES:=$(LINUX_DIR)/drivers/net/ppp/pppox.ko + AUTOLOAD:=$(call AutoLoad,40,pppox) +endef + +define KernelPackage/pppox/description + Kernel helper module for PPPoE and PPTP support +endef + +$(eval $(call KernelPackage,pppox)) + + define KernelPackage/pppoe SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoE support - DEPENDS:=kmod-ppp + DEPENDS:=kmod-ppp +kmod-pppox KCONFIG:=CONFIG_PPPOE - FILES:= \ - $(LINUX_DIR)/drivers/net/pppoe.ko \ - $(LINUX_DIR)/drivers/net/pppox.ko - AUTOLOAD:=$(call AutoLoad,40,pppox pppoe) + FILES:=$(LINUX_DIR)/drivers/net/ppp/pppoe.ko + AUTOLOAD:=$(call AutoLoad,41,pppoe) endef define KernelPackage/pppoe/description - Kernel modules for PPPoE (PPP over Ethernet) support + Kernel module for PPPoE (PPP over Ethernet) support endef $(eval $(call KernelPackage,pppoe)) @@ -468,13 +561,26 @@ endef $(eval $(call KernelPackage,pppoa)) + +define KernelPackage/pptp + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=PPtP support + DEPENDS:=kmod-ppp +kmod-gre +kmod-pppox + KCONFIG:=CONFIG_PPTP + FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko + AUTOLOAD:=$(call AutoLoad,41,pptp) +endef + +$(eval $(call KernelPackage,pptp)) + + define KernelPackage/pppol2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoL2TP support - DEPENDS:=kmod-ppp +kmod-pppoe + DEPENDS:=kmod-ppp +kmod-pppox +kmod-l2tp KCONFIG:=CONFIG_PPPOL2TP - FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.ko - AUTOLOAD:=$(call AutoLoad,40,pppol2tp) + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko + AUTOLOAD:=$(call AutoLoad,41,l2tp_ppp) endef define KernelPackage/pppol2tp/description @@ -503,11 +609,11 @@ $(eval $(call KernelPackage,ipoa)) define KernelPackage/mppe SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Microsoft PPP compression/encryption - DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 + DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 +kmod-crypto-ecb KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE - FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko + FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko AUTOLOAD:=$(call AutoLoad,31,ppp_mppe) endef @@ -518,46 +624,93 @@ endef $(eval $(call KernelPackage,mppe)) -define KernelPackage/sched +SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) +SCHED_MODULES_CORE = sch_ingress sch_codel sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit +SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark sch_esfq +SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES)) +SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES))) +SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) + +define KernelPackage/sched-core SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic schedulers KCONFIG:= \ 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 \ - CONFIG_NET_SCH_HTB \ 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_SCH_CODEL \ + CONFIG_NET_SCH_FQ_CODEL \ CONFIG_NET_CLS=y \ CONFIG_NET_CLS_ACT=y \ - CONFIG_NET_CLS_BASIC \ CONFIG_NET_CLS_FLOW \ CONFIG_NET_CLS_FW \ CONFIG_NET_CLS_ROUTE4 \ CONFIG_NET_CLS_TCINDEX \ CONFIG_NET_CLS_U32 \ CONFIG_NET_ACT_MIRRED \ - CONFIG_NET_ACT_IPT \ - CONFIG_NET_ACT_POLICE \ + CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_EMATCH=y \ + CONFIG_NET_EMATCH_U32 + FILES:=$(SCHED_FILES) + AUTOLOAD:=$(call AutoLoad,70, $(SCHED_MODULES_CORE)) +endef + +define KernelPackage/sched-core/description + Core kernel scheduler support for IP traffic +endef + +$(eval $(call KernelPackage,sched-core)) + + +define KernelPackage/sched-connmark + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Traffic shaper conntrack mark support + DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra + KCONFIG:=CONFIG_NET_ACT_CONNMARK + FILES:=$(LINUX_DIR)/net/sched/act_connmark.ko + AUTOLOAD:=$(call AutoLoad,71, act_connmark) +endef +$(eval $(call KernelPackage,sched-connmark)) + +define KernelPackage/sched-esfq + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Traffic shaper ESFQ support + DEPENDS:=+kmod-sched-core +kmod-ipt-core + KCONFIG:= \ + CONFIG_NET_SCH_ESFQ \ + CONFIG_NET_SCH_ESFQ_NFCT=y + FILES:=$(LINUX_DIR)/net/sched/sch_esfq.ko + AUTOLOAD:=$(call AutoLoad,72, sch_esfq) +endef +$(eval $(call KernelPackage,sched-esfq)) + +define KernelPackage/sched + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Extra traffic schedulers + DEPENDS:=+kmod-sched-core + KCONFIG:= \ + CONFIG_NET_SCH_DSMARK \ + CONFIG_NET_SCH_HTB \ + CONFIG_NET_SCH_FIFO \ + CONFIG_NET_SCH_GRED \ + CONFIG_NET_SCH_PRIO \ + CONFIG_NET_SCH_RED \ + CONFIG_NET_SCH_TBF \ + CONFIG_NET_SCH_SFQ \ + CONFIG_NET_SCH_TEQL \ + CONFIG_NET_CLS_BASIC \ + CONFIG_NET_ACT_POLICE \ + CONFIG_NET_ACT_IPT \ 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/*.ko + FILES:=$(SCHED_FILES_EXTRA) + AUTOLOAD:=$(call AutoLoad,73, $(SCHED_MODULES_EXTRA)) endef define KernelPackage/sched/description - Kernel schedulers for IP traffic + Extra kernel schedulers modules for IP traffic endef $(eval $(call KernelPackage,sched)) @@ -612,6 +765,7 @@ $(eval $(call KernelPackage,mp-alg)) define KernelPackage/pktgen SUBMENU:=$(NETWORK_SUPPORT_MENU) + DEPENDS:=@!TARGET_uml TITLE:=Network packet generator KCONFIG:=CONFIG_NET_PKTGEN FILES:=$(LINUX_DIR)/net/core/pktgen.ko @@ -626,11 +780,13 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) - DEPENDS:=@LINUX_2_6_35 - TITLE:=L2TPv3 Support - KCONFIG:=CONFIG_L2TP - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,32,l2tp_core) + TITLE:=Layer Two Tunneling Protocol (L2TP) + KCONFIG:=CONFIG_L2TP \ + CONFIG_L2TP_V3=y \ + CONFIG_L2TP_DEBUGFS=n + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_core.ko \ + $(LINUX_DIR)/net/l2tp/l2tp_netlink.ko + AUTOLOAD:=$(call AutoLoad,32,l2tp_core l2tp_netlink) endef define KernelPackage/l2tp/description @@ -639,38 +795,97 @@ 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) + KCONFIG:=CONFIG_L2TP_ETH + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_eth.ko + AUTOLOAD:=$(call AutoLoad,33,l2tp_eth) endef define KernelPackage/l2tp-eth/description - Kernel modules for L2TP V3 pseudowire support + Kernel modules for L2TP ethernet pseudowire support for L2TPv3 endef $(eval $(call KernelPackage,l2tp-eth)) define KernelPackage/l2tp-ip SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=Support for L2TP-over-IP socket family + TITLE:=L2TP IP encapsulation for L2TPv3 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) + KCONFIG:=CONFIG_L2TP_IP + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko + AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) endef define KernelPackage/l2tp-ip/description - Kernel modules for L2TP-over-IP socket family + Kernel modules for L2TP IP encapsulation for L2TPv3 endef $(eval $(call KernelPackage,l2tp-ip)) +define KernelPackage/sctp + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=SCTP protocol kernel support + KCONFIG:=\ + CONFIG_IP_SCTP \ + CONFIG_SCTP_DBG_MSG=n \ + CONFIG_SCTP_DBG_OBJCNT=n \ + CONFIG_SCTP_HMAC_NONE=n \ + CONFIG_SCTP_HMAC_SHA1=n \ + CONFIG_SCTP_HMAC_MD5=y \ + CONFIG_SCTP_COOKIE_HMAC_SHA1=n \ + CONFIG_SCTP_COOKIE_HMAC_MD5=y \ + CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=n \ + CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=n \ + 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 +endef + +define KernelPackage/sctp/description + Kernel modules for SCTP protocol support +endef + +$(eval $(call KernelPackage,sctp)) + + +define KernelPackage/netem + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=Network emulation functionality + DEPENDS:=+kmod-sched + KCONFIG:=CONFIG_NET_SCH_NETEM + FILES:=$(LINUX_DIR)/net/sched/sch_netem.ko + AUTOLOAD:=$(call AutoLoad,99,netem) +endef + +define KernelPackage/netem/description + Kernel modules for emulating the properties of wide area networks +endef + +$(eval $(call KernelPackage,netem)) + +define KernelPackage/slip + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=SLIP modules + KCONFIG:= \ + CONFIG_SLIP \ + CONFIG_SLIP_COMPRESSED=y \ + CONFIG_SLIP_SMART=y \ + CONFIG_SLIP_MODE_SLIP6=y + + FILES:= \ + $(LINUX_DIR)/drivers/net/slip/slip.ko + AUTOLOAD:=$(call AutoLoad,30,slip) +endef + +define KernelPackage/slip/description + Kernel modules for SLIP support +endef + +$(eval $(call KernelPackage,slip)) +