add ipv6 conntrack support (closes: #2192)

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index d11a981..b9a8a34 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -6,10 +6,10 @@
 #
 # $Id$
 
-NSMENU:=Network Support
+NETWORK_SUPPORT_MENU:=Network Support
 
 define KernelPackage/atm
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM support
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -29,7 +29,7 @@ $(eval $(call KernelPackage,atm))
 
 
 define KernelPackage/atmtcp
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ATM over TCP
   DEPENDS:=@LINUX_2_6 kmod-atm
   KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y
@@ -45,7 +45,7 @@ $(eval $(call KernelPackage,atmtcp))
 
 
 define KernelPackage/bonding
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Ethernet bonding driver
   KCONFIG:=CONFIG_BONDING
   FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
@@ -59,33 +59,31 @@ endef
 $(eval $(call KernelPackage,bonding))
 
 
-define KernelPackage/ipip
-  SUBMENU:=$(NSMENU)
-  TITLE:=IP in IP encapsulation support
+define KernelPackage/capi
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  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)
-endef
-
-define KernelPackage/ipip/2.6
-#  KCONFIG+=CONFIG_INET_TUNNEL
-  FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,31,tunnel4)
+       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/ipip/description
- Kernel modules for IP in IP encapsulation
+define KernelPackage/capi/description
+ Kernel module for basic CAPI (ISDN) support
 endef
 
-$(eval $(call KernelPackage,ipip))
+$(eval $(call KernelPackage,capi))
 
 
 define KernelPackage/ipsec
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4 and IPv6)
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
   KCONFIG:= \
        CONFIG_NET_KEY \
        CONFIG_XFRM_USER
@@ -105,15 +103,18 @@ $(eval $(call KernelPackage,ipsec))
 
 
 define KernelPackage/ipsec4
-  SUBMENU:=$(NSMENU)
+  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 +125,9 @@ define KernelPackage/ipsec4/description
  - ah4
  - esp4
  - ipcomp
+ - xfrm4_mode_beet
+ - xfrm4_mode_transport
+ - xfrm4_mode_tunnel
  - xfrm4_tunnel
 endef
 
@@ -131,16 +135,18 @@ $(eval $(call KernelPackage,ipsec4))
 
 
 define KernelPackage/ipsec6
-  SUBMENU:=$(NSMENU)
+  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,15 +157,56 @@ define KernelPackage/ipsec6/description
  - ah6
  - esp6
  - ipcomp6
+ - xfrm6_mode_beet
+ - xfrm6_mode_transport
+ - xfrm6_mode_tunnel
  - xfrm6_tunnel
- - tunnel6
 endef
 
 $(eval $(call KernelPackage,ipsec6))
 
 
+define KernelPackage/iptunnel4
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP tunneling (IPv4)
+  KCONFIG:= \
+       CONFIG_NET_IPIP \
+       CONFIG_INET_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ipip)
+endef
+
+define KernelPackage/iptunnel4/2.6
+#  KCONFIG+=CONFIG_INET_TUNNEL
+  FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,31,tunnel4)
+endef
+
+define KernelPackage/iptunnel4/description
+ Kernel modules for IPv4 tunneling (IP in IP encapsulation)
+endef
+
+$(eval $(call KernelPackage,iptunnel4))
+
+
+define KernelPackage/iptunnel6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP tunneling (IPv6)
+  DEPENDS:= @LINUX_2_6
+  KCONFIG:=CONFIG_INET6_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,31,tunnel6)
+endef
+
+define KernelPackage/iptunnel6/description
+ Kernel modules for IPv6 tunneling (IPv6 in IPv6 tunnels)
+endef
+
+$(eval $(call KernelPackage,iptunnel6))
+
+
 define KernelPackage/ipv6
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 support
   KCONFIG:= \
        CONFIG_IPV6 \
@@ -182,7 +229,7 @@ $(eval $(call KernelPackage,ipv6))
 
 
 define KernelPackage/gre
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=GRE support
   KCONFIG:=CONFIG_NET_IPGRE
   FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX)
@@ -196,7 +243,7 @@ $(eval $(call KernelPackage,gre))
 
 
 define KernelPackage/tun
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Universal TUN/TAP driver
   KCONFIG:=CONFIG_TUN
   FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX)
@@ -211,7 +258,7 @@ $(eval $(call KernelPackage,tun))
 
 
 define KernelPackage/ppp
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
   KCONFIG:= \
        CONFIG_PPP \
@@ -245,7 +292,7 @@ $(eval $(call KernelPackage,ppp))
 
 
 define KernelPackage/ppp-synctty
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
@@ -261,7 +308,7 @@ $(eval $(call KernelPackage,ppp-synctty))
 
 
 define KernelPackage/pppoe
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoE support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
@@ -278,10 +325,10 @@ $(eval $(call KernelPackage,pppoe))
 
 
 define KernelPackage/pppoa
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoA support
-  DEPENDS:=kmod-ppp kmod-atm
-  KCONFIG:=CONFIG_PPPOATM
+  DEPENDS:=kmod-ppp +kmod-atm
+  KCONFIG:=CONFIG_PPPOATM CONFIG_ATM_DRIVERS=y
   FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pppoatm)
 endef
@@ -293,10 +340,26 @@ endef
 $(eval $(call KernelPackage,pppoa))
 
 
+define KernelPackage/ipoa
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPoA support
+  DEPENDS:=kmod-atm
+  KCONFIG:=CONFIG_ATM_CLIP
+  FILES:=$(LINUX_DIR)/net/atm/clip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,clip)
+endef
+
+define KernelPackage/ipoa/description
+  Kernel modules for IPoA (IP over ATM) support
+endef
+
+$(eval $(call KernelPackage,ipoa))
+
+
 define KernelPackage/mppe
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Microsoft PPP compression/encryption
-  DEPENDS:=kmod-ppp
+  DEPENDS:=kmod-ppp +kmod-crypto-arc4 +kmod-crypto-sha1
   KCONFIG:= \
        CONFIG_PPP_MPPE_MPPC \
        CONFIG_PPP_MPPE
@@ -322,9 +385,22 @@ $(eval $(call KernelPackage,mppe))
 
 
 define KernelPackage/sched
-  SUBMENU:=$(NSMENU)
+  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
 
@@ -336,7 +412,7 @@ $(eval $(call KernelPackage,sched))
 
 
 define KernelPackage/ax25
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
   KCONFIG:= \
        CONFIG_AX25 \
@@ -355,7 +431,7 @@ $(eval $(call KernelPackage,ax25))
 
 
 define KernelPackage/mp-alg
-  SUBMENU:=$(NSMENU)
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=ECMP caching algorithms
   DEPENDS:=@LINUX_2_6
   KCONFIG:= \
@@ -382,10 +458,10 @@ endef
 $(eval $(call KernelPackage,mp-alg))
 
 
-NDMENU:=Network Devices
+NETWORK_DEVICES_MENU:=Network Devices
 
 define KernelPackage/natsemi
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=National Semiconductor DP8381x series 
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI
@@ -402,7 +478,7 @@ $(eval $(call KernelPackage,natsemi))
 
 
 define KernelPackage/r6040
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RDC Fast-Ethernet support
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040
@@ -417,7 +493,7 @@ $(eval $(call KernelPackage,r6040))
 
 
 define KernelPackage/sis900
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900
@@ -433,7 +509,7 @@ $(eval $(call KernelPackage,sis900))
 
 
 define KernelPackage/via-rhine
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Via Rhine ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VIA_RHINE
@@ -449,7 +525,7 @@ $(eval $(call KernelPackage,via-rhine))
 
 
 define KernelPackage/via-velocity
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
   DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_VIA_VELOCITY
@@ -465,7 +541,7 @@ $(eval $(call KernelPackage,via-velocity))
 
 
 define KernelPackage/8139too
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_8139TOO
@@ -481,7 +557,7 @@ $(eval $(call KernelPackage,8139too))
 
 
 define KernelPackage/r8169
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86 
   KCONFIG:=CONFIG_R8169 CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=n
@@ -497,7 +573,7 @@ $(eval $(call KernelPackage,r8169))
 
 
 define KernelPackage/ne2k-pci
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI
@@ -515,7 +591,7 @@ $(eval $(call KernelPackage,ne2k-pci))
 
 
 define KernelPackage/ixp4xx-npe
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) IXP4xx ethernet support
   DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_IXP4XX_MAC
@@ -534,7 +610,7 @@ $(eval $(call KernelPackage,ixp4xx-npe))
 
 
 define KernelPackage/e100
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100
@@ -550,7 +626,7 @@ $(eval $(call KernelPackage,e100))
 
 
 define KernelPackage/e1000
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Intel(R) PRO/1000 cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E1000
@@ -566,7 +642,7 @@ $(eval $(call KernelPackage,e1000))
 
 
 define KernelPackage/3c59x
-  SUBMENU:=$(NDMENU)
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_3C59X