X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=4794941ef5db7ce25c50338053fe19ac14ebe02d;hp=5117d50dbcef3b9368b84439296fe2d079d62625;hb=17b143c4bd8a652dbfd0b988ee77fad4fa67e148;hpb=d1a1406a8284c5682e9b1326d44012223ad39070 diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index 5117d50dbc..4794941ef5 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -59,24 +59,37 @@ endef $(eval $(call KernelPackage,bonding)) -define KernelPackage/ipip +define KernelPackage/capi SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=IP in IP encapsulation support + TITLE:=CAPI (ISDN) Support + DEPENDS:=@LINUX_2_6 KCONFIG:= \ - CONFIG_NET_IPIP \ - CONFIG_INET_TUNNEL - FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,ipip) + CONFIG_ISDN \ + CONFIG_ISDN_CAPI \ + CONFIG_ISDN_CAPI_CAPI20 + FILES:= \ + $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) +endef + +define KernelPackage/capi/description + Kernel module for basic CAPI (ISDN) support endef -define KernelPackage/ipip/2.6 -# KCONFIG+=CONFIG_INET_TUNNEL - FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,31,tunnel4) +$(eval $(call KernelPackage,capi)) + + +define KernelPackage/ipip + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=IP-in-IP encapsulation + KCONFIG:=CONFIG_NET_IPIP + FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,ipip) endef define KernelPackage/ipip/description - Kernel modules for IP in IP encapsulation + Kernel modules for IP-in-IP encapsulation endef $(eval $(call KernelPackage,ipip)) @@ -85,7 +98,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 @@ -107,13 +120,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 @@ -124,6 +140,9 @@ define KernelPackage/ipsec4/description - ah4 - esp4 - ipcomp + - xfrm4_mode_beet + - xfrm4_mode_transport + - xfrm4_mode_tunnel - xfrm4_tunnel endef @@ -133,14 +152,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 @@ -151,29 +172,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 @@ -181,6 +236,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 @@ -281,7 +352,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 @@ -312,7 +383,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 @@ -340,7 +411,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 @@ -398,6 +482,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 @@ -581,11 +681,27 @@ endef $(eval $(call KernelPackage,e1000)) +define KernelPackage/r8169 + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Realtek 8169 gigabit ethernet support + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_R8169 + FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,r8169) +endef + +define KernelPackage/r8169/description + Kernel modules for Realtek 8169 gigabit ethernet support. +endef + +$(eval $(call KernelPackage,r8169)) + + 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