X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/50584c3b665e93b4b4fef40731ffe00fbdee25bc..7a694d4e5f8054d5c4b05fbed69fb1a38f387e29:/package/kernel/modules/network.mk diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index b7f8de685..1c243c170 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -82,22 +82,15 @@ $(eval $(call KernelPackage,capi)) define KernelPackage/ipip SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=IP in IP encapsulation support - KCONFIG:= \ - CONFIG_NET_IPIP \ - CONFIG_INET_TUNNEL + TITLE:=IP-in-IP encapsulation + DEPENDS:=+kmod-iptunnel4 + KCONFIG:=CONFIG_NET_IPIP FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ipip) endef -define KernelPackage/ipip/2.6 -# KCONFIG+=CONFIG_INET_TUNNEL - FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,31,tunnel4) -endef - define KernelPackage/ipip/description - Kernel modules for IP in IP encapsulation + Kernel modules for IP-in-IP encapsulation endef $(eval $(call KernelPackage,ipip)) @@ -106,7 +99,7 @@ $(eval $(call KernelPackage,ipip)) define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4 and IPv6) - DEPENDS:=@LINUX_2_6 +kmod-crypto + 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 @@ -128,13 +121,16 @@ $(eval $(call KernelPackage,ipsec)) define KernelPackage/ipsec4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4) - DEPENDS:=kmod-ipsec + DEPENDS:=kmod-ipsec +kmod-iptunnel4 KCONFIG:= \ CONFIG_INET_AH \ CONFIG_INET_ESP \ CONFIG_INET_IPCOMP \ + CONFIG_INET_XFRM_MODE_BEET \ + CONFIG_INET_XFRM_MODE_TRANSPORT \ + CONFIG_INET_XFRM_MODE_TUNNEL \ CONFIG_INET_XFRM_TUNNEL - FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_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) \ ) endef @@ -145,6 +141,9 @@ define KernelPackage/ipsec4/description - ah4 - esp4 - ipcomp + - xfrm4_mode_beet + - xfrm4_mode_transport + - xfrm4_mode_tunnel - xfrm4_tunnel endef @@ -154,14 +153,16 @@ $(eval $(call KernelPackage,ipsec4)) define KernelPackage/ipsec6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv6) - DEPENDS:=kmod-ipsec + DEPENDS:=kmod-ipsec +kmod-iptunnel6 KCONFIG:= \ CONFIG_INET6_AH \ CONFIG_INET6_ESP \ CONFIG_INET6_IPCOMP \ - CONFIG_INET6_XFRM_TUNNEL \ - CONFIG_INET6_TUNNEL - FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \ + CONFIG_INET6_XFRM_MODE_BEET \ + 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) \ ) endef @@ -172,29 +173,63 @@ define KernelPackage/ipsec6/description - ah6 - esp6 - ipcomp6 + - xfrm6_mode_beet + - xfrm6_mode_transport + - xfrm6_mode_tunnel - xfrm6_tunnel - - tunnel6 endef $(eval $(call KernelPackage,ipsec6)) +# NOTE: tunnel4 is not selectable by itself, so enable ipip for that +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) \ + ) + AUTOLOAD:=$(call AutoLoad,31,tunnel4) +endef + +define KernelPackage/iptunnel4/description + Kernel modules for IPv4 tunneling +endef + +$(eval $(call KernelPackage,iptunnel4)) + + +define KernelPackage/iptunnel6 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IPv6 tunneling + DEPENDS:= @LINUX_2_6 + KCONFIG:= \ + CONFIG_INET6_TUNNEL + FILES:= $(foreach mod,tunnel6, \ + $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \ + ) + AUTOLOAD:=$(call AutoLoad,31,tunnel6) +endef + +define KernelPackage/iptunnel6/description + Kernel modules for IPv6 tunneling +endef + +$(eval $(call KernelPackage,iptunnel6)) + + define KernelPackage/ipv6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 support - KCONFIG:= \ - CONFIG_IPV6 \ - CONFIG_IPV6_SIT + KCONFIG:=CONFIG_IPV6 FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,ipv6) endef -define KernelPackage/ipv6/2.6 -# KCONFIG+=CONFIG_IPV6_SIT - FILES+=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,21,sit) -endef - define KernelPackage/ipv6/description Kernel modules for IPv6 support endef @@ -202,6 +237,22 @@ endef $(eval $(call KernelPackage,ipv6)) +define KernelPackage/sit + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IPv6-in-IPv4 tunnelling + DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel4 + KCONFIG+=CONFIG_IPV6_SIT + FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,32,sit) +endef + +define KernelPackage/sit/description + Kernel modules for IPv6-in-IPv4 tunnelling +endef + +$(eval $(call KernelPackage,sit)) + + define KernelPackage/gre SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=GRE support @@ -302,7 +353,7 @@ define KernelPackage/pppoa SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoA support DEPENDS:=kmod-ppp +kmod-atm - KCONFIG:=CONFIG_PPPOATM + KCONFIG:=CONFIG_PPPOATM CONFIG_ATM_DRIVERS=y FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,pppoatm) endef @@ -333,7 +384,7 @@ $(eval $(call KernelPackage,ipoa)) define KernelPackage/mppe SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Microsoft PPP compression/encryption - DEPENDS:=kmod-ppp +kmod-crypto + DEPENDS:=kmod-ppp +kmod-crypto-arc4 +kmod-crypto-sha1 KCONFIG:= \ CONFIG_PPP_MPPE_MPPC \ CONFIG_PPP_MPPE @@ -361,7 +412,20 @@ $(eval $(call KernelPackage,mppe)) define KernelPackage/sched SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic schedulers - KCONFIG:=CONFIG_NET_SCHED + KCONFIG:= \ + CONFIG_NET_SCHED=y \ + CONFIG_NET_SCH_DSMARK \ + CONFIG_NET_SCH_ESFQ \ + 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_SFQ \ + CONFIG_NET_SCH_TBF \ + CONFIG_NET_SCH_TEQL FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX) endef @@ -419,6 +483,22 @@ endef $(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) + AUTOLOAD:=$(call AutoLoad,99,pktgen) +endef + +define KernelPackage/pktgen/description + Kernel modules for the Network Packet Generator +endef + +$(eval $(call KernelPackage,pktgen)) + + NETWORK_DEVICES_MENU:=Network Devices define KernelPackage/natsemi @@ -606,7 +686,7 @@ define KernelPackage/3c59x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_3C59X + KCONFIG:=CONFIG_VORTEX FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,3c59x) endef