X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetsupport.mk;h=d893c1add745d07d957e15dc9adcc391d6c16457;hb=cdc7e3eae9be4f957eb4922fa130d0117b6442a8;hp=9ddcb1d306d92e88072441ffa82f4e5a44915597;hpb=73b4b25731d5e98c16abdcfe88c828005bfa85ac;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 9ddcb1d306..d893c1add7 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -231,10 +231,10 @@ $(eval $(call KernelPackage,ipip))
 
 
 IPSEC-m:= \
-	key/af_key \
-	xfrm/xfrm_ipcomp \
 	$(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \
+	xfrm/xfrm_ipcomp \
 	xfrm/xfrm_user \
+	key/af_key \
 
 define KernelPackage/ipsec
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -445,6 +445,22 @@ endef
 $(eval $(call KernelPackage,gre))
 
 
+define KernelPackage/gre6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=GRE support over IPV6
+  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
+  KCONFIG:=CONFIG_IPV6_GRE
+  FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
+  AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
+endef
+
+define KernelPackage/gre6/description
+ Generic Routing Encapsulation support over IPv6
+endef
+
+$(eval $(call KernelPackage,gre6))
+
+
 define KernelPackage/tun
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Universal TUN/TAP driver
@@ -820,7 +836,12 @@ define KernelPackage/sctp
      CONFIG_SCTP_DBG_OBJCNT=n \
      CONFIG_SCTP_HMAC_NONE=n \
      CONFIG_SCTP_HMAC_SHA1=n \
-     CONFIG_SCTP_HMAC_MD5=y
+     CONFIG_SCTP_HMAC_MD5=y \
+     CONFIG_SCTP_COOKIE_HMAC_SHA1=n \
+     CONFIG_SCTP_COOKIE_HMAC_MD5=y \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=n \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=n \
+     CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
   FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
   AUTOLOAD:= $(call AutoLoad,32,sctp)
   DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac