X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dcc6bbd3a0167774f2a49854f0e0d8acec4cfd94..96266367b7d0b9442c510b4c76a2b7d768c1f717:/package/kernel/modules/network.mk?ds=sidebyside

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 38de54c60..c546d638e 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -123,7 +123,7 @@ $(eval $(call KernelPackage,ipsec))
 define KernelPackage/ipsec4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv4)
-  DEPENDS:=kmod-ipsec +kmod-iptunnel4
+  DEPENDS:=kmod-ipsec +kmod-iptunnel4 +kmod-crypto-aead
   KCONFIG:= \
 	CONFIG_INET_AH \
 	CONFIG_INET_ESP \
@@ -155,7 +155,7 @@ $(eval $(call KernelPackage,ipsec4))
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPsec related modules (IPv6)
-  DEPENDS:=kmod-ipsec +kmod-iptunnel6
+  DEPENDS:=kmod-ipsec +kmod-iptunnel6 +kmod-crypto-aead
   KCONFIG:= \
 	CONFIG_INET6_AH \
 	CONFIG_INET6_ESP \
@@ -208,7 +208,7 @@ $(eval $(call KernelPackage,iptunnel4))
 define KernelPackage/iptunnel6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 tunneling
-  DEPENDS:= @LINUX_2_6
+  DEPENDS:= @LINUX_2_6 +kmod-ipv6
   KCONFIG:= \
 	CONFIG_INET6_TUNNEL
   FILES:= $(foreach mod,tunnel6, \
@@ -227,7 +227,11 @@ $(eval $(call KernelPackage,iptunnel6))
 define KernelPackage/ipv6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv6 support
-  KCONFIG:=CONFIG_IPV6
+  KCONFIG:= \
+	CONFIG_IPV6 \
+	CONFIG_IPV6_PRIVACY=y \
+	CONFIG_IPV6_MULTIPLE_TABLES=y \
+	CONFIG_IPV6_SUBTREES=y
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef
@@ -241,6 +245,7 @@ $(eval $(call KernelPackage,ipv6))
 
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  DEPENDS:=+kmod-iptunnel4
   TITLE:=IPv6-in-IPv4 tunnelling
 endef
 
@@ -264,6 +269,24 @@ endef
 $(eval $(call KernelPackage,sit))
 
 
+define KernelPackage/ip6-tunnel
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP-in-IPv6 tunnelling
+  DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel6
+  KCONFIG:= CONFIG_IPV6_TUNNEL
+  FILES:= $(foreach mod,ip6_tunnel, \
+	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
+  )
+  AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel)
+endef
+
+define KernelPackage/ip6-tunnel/description
+ Kernel modules for IPv6-in-IPv6 and IPv4-in-IPv6 tunnelling
+endef
+
+$(eval $(call KernelPackage,ip6-tunnel))
+
+
 define KernelPackage/gre
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=GRE support
@@ -535,6 +558,7 @@ define KernelPackage/r6040
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040
   FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 
 define KernelPackage/r6040/description
@@ -559,6 +583,27 @@ endef
 
 $(eval $(call KernelPackage,sis900))
 
+define KernelPackage/sky2
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=SysKonnect Yukon2 support
+  DEPENDS:=@TARGET_x86
+  KCONFIG:=CONFIG_SKY2
+  FILES:=$(LINUX_DIR)/drivers/net/sky2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,sky2)
+endef
+
+define KernelPackage/sky2/description
+  This driver supports Gigabit Ethernet adapters based on the
+  Marvell Yukon 2 chipset:
+  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+  There is companion driver for the older Marvell Yukon and
+  Genesis based adapters: skge.
+endef
+
+$(eval $(call KernelPackage,sky2))
+
 
 define KernelPackage/via-rhine
   SUBMENU:=$(NETWORK_DEVICES_MENU)
@@ -696,7 +741,7 @@ define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
   FILES:=$(LINUX_DIR)/drivers/net/b44.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_B44
-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86 @BROKEN
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   AUTOLOAD:=$(call AutoLoad,50,b44)
 endef