This adds a new kmod-sctp option that enables support of SCTP in 2.6x
kernels.
The patch also contains a small cleanup in the dependencies.

Signed-off-by: Sebastien Decugis <[email protected]>

---

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index da52b32..8a98a50 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -25,16 +25,13 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
-  # for crc32c
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
+  DEPENDS:=+kmod-libcrc32c
   KCONFIG:=\
-       CONFIG_LIBCRC32C \
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n
   FILES:=\
-       $(LINUX_DIR)/lib/libcrc32c.ko \
        $(LINUX_DIR)/fs/btrfs/btrfs.ko
-  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1)
+  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
 endef
 
 define KernelPackage/fs-btrfs/description
diff --git a/package/kernel/modules/netsupport.mk 
b/package/kernel/modules/netsupport.mk
index 196e5a3..509b723 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -674,3 +674,21 @@ endef
 $(eval $(call KernelPackage,l2tp-ip))
 
 
+define KernelPackage/sctp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=SCTP protocol kernel support
+  KCONFIG:=\
+     CONFIG_IP_SCTP=m \
+     CONFIG_SCTP_HMAC_MD5=y
+  FILES:= $(LINUX_DIR)/net/sctp/sctp.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:= $(call AutoLoad,32,sctp)
+  DEPENDS:=+kmod-libcrc32c +kmod-crypto-md5 +kmod-crypto-hmac
+endef
+
+define KernelPackage/sctp/description
+ Kernel modules for SCTP protocol support
+endef
+
+$(eval $(call KernelPackage,sctp))
+
+
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index f27e2ef..4379e8f 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -116,6 +116,22 @@ endef
 $(eval $(call KernelPackage,crc16))
 
 
+define KernelPackage/libcrc32c
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=CRC32 library support
+  KCONFIG:=CONFIG_LIBCRC32C=m
+  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc 
+  FILES:=$(LINUX_DIR)/lib/libcrc32c.ko
+  AUTOLOAD:=$(call AutoLoad,20,crc32c libcrc32c,1)
+endef
+
+define KernelPackage/libcrc32c/description
+ Kernel module for CRC32 support
+endef
+
+$(eval $(call KernelPackage,libcrc32c))
+
+
 define KernelPackage/eeprom-93cx6
   SUBMENU:=$(OTHER_MENU)
   TITLE:=EEPROM 93CX6 support
diff --git a/target/linux/generic/config-2.6.34 
b/target/linux/generic/config-2.6.34
index cec7096..de8fe20 100644
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@@ -1091,6 +1091,11 @@ CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_SCTP is not set
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 # CONFIG_IPV6 is not set
 # CONFIG_IPV6_MIP6 is not set
diff --git a/target/linux/generic/config-2.6.35 
b/target/linux/generic/config-2.6.35
index 1a725a8..b93e7b3 100644
--- a/target/linux/generic/config-2.6.35
+++ b/target/linux/generic/config-2.6.35
@@ -1117,6 +1117,11 @@ CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_SCTP is not set
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+# CONFIG_SCTP_HMAC_MD5 is not set
 CONFIG_IPSEC_NAT_TRAVERSAL=y
 # CONFIG_IPV6 is not set
 # CONFIG_IPV6_MIP6 is not set


_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to