X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=f3ab2ff700fbe8ae8b142da052d9e06667193275;hb=87e6a7e4f21ff57ba3ec947614f52967f57a9cbb;hp=bbd694bf3ed1c37d29f4e16cdd4d74424181ba3b;hpb=ce19a369af232ac48f9b27a2e20af87b1129cb6b;p=openwrt%2Fopenwrt.git

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index bbd694bf3e..f3ab2ff700 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -34,6 +34,7 @@ define KernelPackage/atmtcp
 endef
 $(eval $(call KernelPackage,atmtcp))
 
+
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
@@ -55,6 +56,60 @@ define KernelPackage/ipip/2.6
   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
 endef
 
+
+define KernelPackage/ipsec
+  TITLE:=IPsec related modules (IPv4 and IPv6)
+  DESCRIPTION:=\
+	Kernel modules for IPsec support in both IPv4 and IPv6.\\\
+	Includes:\\\
+	- af_key\\\
+	- xfrm_user
+  SUBMENU:=$(NSMENU)
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=$(CONFIG_NET_KEY)
+  FILES:= \
+	$(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,ipsec))
+
+define KernelPackage/ipsec4
+  TITLE:=IPsec related modules (IPv4)
+  DESCRIPTION:=\
+	Kernel modules for IPsec support in IPv4.\\\
+	Includes:\\\
+	- ah4\\\
+	- esp4\\\
+	- ipcomp\\\
+	- xfrm4_tunnel
+  SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_INET_AH)
+  DEPENDS:=kmod-ipsec
+  FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
+	$(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+  )
+endef
+$(eval $(call KernelPackage,ipsec4))
+
+define KernelPackage/ipsec6
+  TITLE:=IPsec related modules (IPv6)
+  DESCRIPTION:=\
+	Kernel modules for IPsec support in IPv6.\\\
+	Includes:\\\
+	- ah6\\\
+	- esp6\\\
+	- ipcomp6\\\
+	- xfrm6_tunnel
+  SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_INET6_AH)
+  DEPENDS:=kmod-ipsec
+  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
+	$(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \
+  )
+endef
+$(eval $(call KernelPackage,ipsec6))
+
+
 define KernelPackage/ipv6
   TITLE:=IPv6 support
   DESCRIPTION:=\
@@ -169,33 +224,19 @@ endef
 $(eval $(call KernelPackage,sched))
 
 
-define KernelPackage/ieee80211softmac
-  TITLE:=802.11 Networking stack
-  DESCRIPTION:=\\\
-	\\\
-	Includes: \\\
-	- ieee80211_crypt \\\
-	- ieee80211 \\\
-	- ieee80211_crypt_wep \\\
-	- ieee80211_crypt_tkip \\\
-	- ieee80211_crytp_ccmp \\\
-	- ieee80211softmac
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
-  FILES:= \
-  	$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,10, \
-	ieee80211_crypt \
-	ieee80211 \
-	ieee80211_crypt_wep \
-	ieee80211_crypt_tkip \
-	ieee80211_crypt_ccmp \
-	ieee80211softmac \
-  )
+
+define KernelPackage/ax25
+  TITLE:=AX25 support
+  DESCRIPTION:=Kernel modules for AX25 support
   SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_AX25)
+  FILES:= \
+	$(MODULES_DIR)/kernel/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
 endef
-$(eval $(call KernelPackage,ieee80211softmac))
+$(eval $(call KernelPackage,ax25))
+