add qca

2025-03-09 15:40:03 +00:00 · 2022-09-13 12:59:02 +08:00 · 2022-09-13 12:59:02 +08:00 · 8f8028cb7f
commit 8f8028cb7f
parent 083306174f
86 changed files with 50519 additions and 0 deletions
--- a/qca/qca-nss-ecm/Makefile
+++ b/qca/qca-nss-ecm/Makefile
@ -0,0 +1,97 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=qca-nss-ecm
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-nss-ecm.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-06-15
+PKG_SOURCE_VERSION:=34267065855d32f33264dc3054efb0e8103d627b
+PKG_MIRROR_HASH:=0917659d69c5f3e6067d6671b9393b4b2d6b6cd5a7bacf5e7d6cf842dc906eca
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/qca-nss-ecm
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  SUBMENU:=Network Support
+  DEPENDS:=@LINUX_5_10 @(TARGET_ipq807x||TARGET_ipq60xx) \
+  	+kmod-qca-nss-drv \
+	+iptables-mod-extra \
+	+kmod-ipt-conntrack \
+	+kmod-ipt-physdev \
+	+iptables-mod-physdev \
+	+kmod-ppp \
+	+kmod-pppoe
+  TITLE:=QCA NSS Enhanced Connection Manager (ECM)
+  FILES:=$(PKG_BUILD_DIR)/*.ko
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
+	CONFIG_NF_CONNTRACK_EVENTS=y \
+	CONFIG_NF_CONNTRACK_CHAIN_EVENTS=n \
+	CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=n
+endef
+
+define KernelPackage/qca-nss-ecm/Description
+This package contains the QCA NSS Enhanced Connection Manager
+endef
+
+define KernelPackage/qca-nss-ecm/install
+	$(INSTALL_DIR) $(1)/etc/firewall.d $(1)/etc/init.d $(1)/usr/bin $(1)/lib/netifd/offload $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/sysctl.d
+	$(INSTALL_DATA) ./files/qca-nss-ecm.firewall $(1)/etc/firewall.d/qca-nss-ecm
+	$(INSTALL_BIN) ./files/qca-nss-ecm.init $(1)/etc/init.d/qca-nss-ecm
+	$(INSTALL_BIN) ./files/ecm_dump.sh $(1)/usr/bin/
+	$(INSTALL_BIN) ./files/on-demand-down $(1)/lib/netifd/offload/on-demand-down
+	$(INSTALL_DATA) ./files/qca-nss-ecm.uci $(1)/etc/config/ecm
+	$(INSTALL_DATA) ./files/qca-nss-ecm.defaults $(1)/etc/uci-defaults/99-qca-nss-ecm
+	$(INSTALL_BIN) ./files/qca-nss-ecm.sysctl $(1)/etc/sysctl.d/qca-nss-ecm.conf
+	echo 'net.netfilter.nf_conntrack_max=8192' >> $(1)/etc/sysctl.d/qca-nss-ecm.conf
+endef
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/qca-nss-drv
+
+ifneq (, $(findstring $(CONFIG_TARGET_BOARD), "ipq807x" "ipq60xx"))
+ECM_MAKE_OPTS+= ECM_FRONT_END_NSS_ENABLE=y \
+		ECM_CLASSIFIER_HYFI_ENABLE=n \
+		ECM_MULTICAST_ENABLE=n \
+		ECM_INTERFACE_IPSEC_ENABLE=n \
+		ECM_INTERFACE_PPTP_ENABLE=n \
+		ECM_INTERFACE_L2TPV2_ENABLE=n \
+		ECM_INTERFACE_GRE_TAP_ENABLE=n \
+		ECM_INTERFACE_GRE_TUN_ENABLE=n \
+		ECM_INTERFACE_SIT_ENABLE=n \
+		ECM_INTERFACE_TUNIPIP6_ENABLE=n \
+		ECM_INTERFACE_RAWIP_ENABLE=n \
+		ECM_INTERFACE_VLAN_ENABLE=n \
+		ECM_CLASSIFIER_MARK_ENABLE=n \
+		ECM_CLASSIFIER_DSCP_ENABLE=n \
+		ECM_CLASSIFIER_PCC_ENABLE=n \
+		ECM_BAND_STEERING_ENABLE=n \
+		ECM_INTERFACE_PPPOE_ENABLE=y
+endif
+
+ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
+    SOC="ipq807x_64"
+else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
+    SOC="ipq60xx_64"
+endif
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/include/qca-nss-ecm
+	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-ecm
+endef
+
+define Build/Compile
+	+$(MAKE) -C "$(LINUX_DIR)" $(strip $(ECM_MAKE_OPTS)) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC=$(SOC) \
+		$(KERNEL_MAKE_FLAGS) \
+		$(PKG_JOBS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,qca-nss-ecm))
--- a/qca/qca-nss-ecm/files/ecm_dump.sh
+++ b/qca/qca-nss-ecm/files/ecm_dump.sh
@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+ECM_MODULE=${1:-ecm_state}
+MOUNT_ROOT=/dev/ecm
+
+#
+# usage: ecm_dump.sh [module=ecm_db]
+#
+# with no parameters, ecm_dump.sh will attempt to mount the
+# ecm_db state file and cat its contents.
+#
+# example with a parameter: ecm_dump.sh ecm_classifier_default
+#
+# this will cause ecm_dump to attempt to find and mount the state
+# file for the ecm_classifier_default module, and if successful
+# cat the contents.
+#
+
+# this is one of the state files, which happens to be the
+# last module started in ecm
+ECM_STATE=/sys/kernel/debug/ecm/ecm_state/state_dev_major
+
+# tests to see if ECM is up and ready to receive commands.
+# returns 0 if ECM is fully up and ready, else 1
+ecm_is_ready() {
+	if [ ! -e "${ECM_STATE}" ]
+	then
+		return 1
+	fi
+	return 0
+}
+
+#
+# module_state_mount(module_name)
+#      Mounts the state file of the module, if supported
+#
+module_state_mount() {
+	local module_name=$1
+	local mount_dir=$2
+	local state_file="/sys/kernel/debug/ecm/${module_name}/state_dev_major"
+
+	if [ -e "${mount_dir}/${module_name}" ]
+	then
+		# already mounted
+		return 0
+	fi
+
+	#echo "Mount state file for $module_name ..."
+	if [ ! -e "$state_file" ]
+	then
+		#echo "... $module_name does not support state"
+		return 1
+	fi
+
+	local major="`cat $state_file`"
+	#echo "... Mounting state $state_file with major: $major"
+	mknod "${mount_dir}/${module_name}" c $major 0
+}
+
+#
+# main
+#
+ecm_is_ready || {
+	#echo "ECM is not running"
+	exit 1
+}
+
+# all state files are mounted under MOUNT_ROOT, so make sure it exists
+mkdir -p ${MOUNT_ROOT}
+
+#
+# attempt to mount state files for the requested module and cat it
+# if the mount succeeded
+#
+module_state_mount ${ECM_MODULE} ${MOUNT_ROOT} && {
+	cat ${MOUNT_ROOT}/${ECM_MODULE}
+	exit 0
+}
+
+exit 2
--- a/qca/qca-nss-ecm/files/on-demand-down
+++ b/qca/qca-nss-ecm/files/on-demand-down
@ -0,0 +1,6 @@
+#!/bin/sh
+# Copyright (c) 2016 The Linux Foundation. All rights reserved.
+
+[ -e "/sys/kernel/debug/ecm/ecm_db/defunct_all" ] && {
+	echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+}
--- a/qca/qca-nss-ecm/files/qca-nss-ecm.defaults
+++ b/qca/qca-nss-ecm/files/qca-nss-ecm.defaults
@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+uci -q batch << EOF
+	delete firewall.qcanssecm
+	set firewall.qcanssecm=include
+	set firewall.qcanssecm.type=script
+	set firewall.qcanssecm.path=/etc/firewall.d/qca-nss-ecm
+	set firewall.qcanssecm.family=any
+	set firewall.qcanssecm.reload=1
+	commit firewall
+EOF
+
+exit 0
--- a/qca/qca-nss-ecm/files/qca-nss-ecm.firewall
+++ b/qca/qca-nss-ecm/files/qca-nss-ecm.firewall
@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+iptables -A FORWARD -m physdev --physdev-is-bridged -j ACCEPT
--- a/qca/qca-nss-ecm/files/qca-nss-ecm.init
+++ b/qca/qca-nss-ecm/files/qca-nss-ecm.init
@ -0,0 +1,142 @@
+#!/bin/sh  /etc/rc.common
+#
+# Copyright (c) 2014, 2019-2020 The Linux Foundation. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# The shebang above has an extra space intentially to avoid having
+# openwrt build scripts automatically enable this package starting
+# at boot.
+
+START=19
+
+get_front_end_mode() {
+	config_load "ecm"
+	config_get front_end global acceleration_engine "auto"
+
+	case $front_end in
+	auto)
+		echo '0'
+		;;
+	nss)
+		echo '1'
+		;;
+	sfe)
+		echo '2'
+		;;
+	*)
+		echo 'uci_option_acceleration_engine is invalid'
+	esac
+}
+
+support_bridge() {
+	#NSS support bridge acceleration
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && return 0
+	#SFE doesn't support bridge acceleration
+	[ -d /sys/kernel/debug/ecm/ecm_sfe_ipv4 ] && return 1
+}
+
+load_sfe() {
+	local kernel_version=$(uname -r)
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe.ko" ] && {
+		[ -d /sys/module/shortcut_fe ] || insmod shortcut-fe
+	}
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe-ipv6.ko" ] && {
+		[ -d /sys/module/shortcut_fe_ipv6 ] || insmod shortcut-fe-ipv6
+	}
+
+	[ -e "/lib/modules/$kernel_version/shortcut-fe-drv.ko" ] && {
+		[ -d /sys/module/shortcut_fe_drv ] || insmod shortcut-fe-drv
+	}
+}
+
+load_ecm() {
+	[ -d /sys/module/ecm ] || {
+		[ ! -e /proc/device-tree/MP_256 ] && load_sfe
+		insmod ecm front_end_selection=$(get_front_end_mode)
+	}
+
+	support_bridge && {
+		sysctl -w net.bridge.bridge-nf-call-ip6tables=1
+		sysctl -w net.bridge.bridge-nf-call-iptables=1
+	}
+}
+
+unload_ecm() {
+	sysctl -w net.bridge.bridge-nf-call-ip6tables=0
+	sysctl -w net.bridge.bridge-nf-call-iptables=0
+
+	if [ -d /sys/module/ecm ]; then
+		#
+		# Stop ECM frontends
+		#
+		echo 1 > /sys/kernel/debug/ecm/front_end_ipv4_stop
+		echo 1 > /sys/kernel/debug/ecm/front_end_ipv6_stop
+
+		#
+		# Defunct the connections
+		#
+	        echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
+		sleep 5;
+
+		rmmod ecm
+		sleep 1
+	fi
+}
+
+start() {
+	# If SFE CM is loaded, return.
+	if [ -d /sys/module/shortcut_fe_cm ]; then
+		echo "shortcut_fe CM is loaded, unload it first"
+		echo "cmd: /etc/init.d/shortcut_fe stop"
+		return
+	fi
+
+	load_ecm
+
+	# If the acceleration engine is NSS, enable wifi redirect.
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=1
+
+	support_bridge && {
+		if ([ -z "$(grep "net.bridge.bridge-nf-call-ip6tables=1" /etc/sysctl.d/qca-nss-ecm.conf)" ] && [ -z "$(grep "net.bridge.bridge-nf-call-iptables=1" /etc/sysctl.d/qca-nss-ecm.conf)" ]); then
+			echo 'net.bridge.bridge-nf-call-ip6tables=1' >> /etc/sysctl.d/qca-nss-ecm.conf
+			echo 'net.bridge.bridge-nf-call-iptables=1' >> /etc/sysctl.d/qca-nss-ecm.conf
+		fi
+	}
+
+	if [ -d /sys/module/qca_ovsmgr ]; then
+		insmod ecm_ovs
+	fi
+
+}
+
+stop() {
+	# If ECM is already not loaded, just return.
+	if [ ! -d /sys/module/ecm ]; then
+		return
+	fi
+
+	# If the acceleration engine is NSS, disable wifi redirect.
+	[ -d /sys/kernel/debug/ecm/ecm_nss_ipv4 ] && sysctl -w dev.nss.general.redirect=0
+
+	sed '/net.bridge.bridge-nf-call-ip6tables=1/d' -i /etc/sysctl.d/qca-nss-ecm.conf
+	sed '/net.bridge.bridge-nf-call-iptables=1/d' -i /etc/sysctl.d/qca-nss-ecm.conf
+
+	if [ -d /sys/module/ecm_ovs ]; then
+		rmmod ecm_ovs
+	fi
+
+	unload_ecm
+}
--- a/qca/qca-nss-ecm/files/qca-nss-ecm.sysctl
+++ b/qca/qca-nss-ecm/files/qca-nss-ecm.sysctl
@ -0,0 +1,2 @@
+# nf_conntrack_tcp_no_window_check is 0 by default, set it to 1
+net.netfilter.nf_conntrack_tcp_no_window_check=1
--- a/qca/qca-nss-ecm/files/qca-nss-ecm.uci
+++ b/qca/qca-nss-ecm/files/qca-nss-ecm.uci
@ -0,0 +1,2 @@
+config ecm 'global'
+	option acceleration_engine 'auto'
--- a/qca/qca-nss-ecm/patches/001-treewide-componentize-the-module-even-more.patch
+++ b/qca/qca-nss-ecm/patches/001-treewide-componentize-the-module-even-more.patch
@ -0,0 +1,335 @@
+From 73345c87b28a473b35b57e673f8de963c3d73da1 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Wed, 19 May 2021 02:38:53 +0200
+Subject: [PATCH] treewide: componentize the module even more
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ Makefile                         | 56 +++++++++++++++++++++++++-------
+ ecm_db/ecm_db_connection.c       |  8 +++++
+ ecm_db/ecm_db_node.c             |  4 +++
+ ecm_interface.c                  |  8 +++++
+ frontends/ecm_front_end_common.c |  7 ++++
+ 5 files changed, 72 insertions(+), 11 deletions(-)
+
+--- a/Makefile
+++ b/Makefile
+@@ -82,10 +82,18 @@ ccflags-$(ECM_INTERFACE_BOND_ENABLE) +=
+ # Define ECM_INTERFACE_PPPOE_ENABLE=y in order
+ # to enable support for PPPoE acceleration.
+ # #############################################################################
+-ECM_INTERFACE_PPPOE_ENABLE=y
+ifndef $(ECM_INTERFACE_PPPOE_ENABLE)
+	ECM_INTERFACE_PPPOE_ENABLE=y
+endif
+ ccflags-$(ECM_INTERFACE_PPPOE_ENABLE) += -DECM_INTERFACE_PPPOE_ENABLE
+ 
+ # #############################################################################
+# Define ECM_INTERFACE_L2TPV2_PPTP_ENABLE=y in order
+# to enable support for l2tpv2 or PPTP detection.
+# #############################################################################
+ccflags-$(ECM_INTERFACE_L2TPV2_PPTP_ENABLE) += -DECM_INTERFACE_L2TPV2_PPTP_ENABLE
+
+# #############################################################################
+ # Define ECM_INTERFACE_L2TPV2_ENABLE=y in order
+ # to enable support for l2tpv2 acceleration.
+ # #############################################################################
+@@ -118,6 +126,12 @@ ccflags-$(ECM_INTERFACE_PPP_ENABLE) += -
+ ccflags-$(ECM_INTERFACE_MAP_T_ENABLE) += -DECM_INTERFACE_MAP_T_ENABLE
+ 
+ # #############################################################################
+# Define ECM_INTERFACE_GRE_ENABLE=y in order
+# to enable support for GRE detection.
+# #############################################################################
+ccflags-$(ECM_INTERFACE_GRE_ENABLE) += -DECM_INTERFACE_GRE_ENABLE
+
+# #############################################################################
+ # Define ECM_INTERFACE_GRE_TAP_ENABLE=y in order
+ # to enable support for GRE TAP interface.
+ # #############################################################################
+@@ -186,7 +200,9 @@ ccflags-$(ECM_INTERFACE_OVS_BRIDGE_ENABL
+ # #############################################################################
+ # Define ECM_INTERFACE_VLAN_ENABLE=y in order to enable support for VLAN
+ # #############################################################################
+-ECM_INTERFACE_VLAN_ENABLE=y
+ifndef $(ECM_INTERFACE_VLAN_ENABLE)
+	ECM_INTERFACE_VLAN_ENABLE=y
+endif
+ ccflags-$(ECM_INTERFACE_VLAN_ENABLE) += -DECM_INTERFACE_VLAN_ENABLE
+ 
+ # #############################################################################
+@@ -228,7 +244,9 @@ ccflags-$(ECM_CLASSIFIER_OVS_ENABLE) +=
+ # #############################################################################
+ # Define ECM_CLASSIFIER_MARK_ENABLE=y in order to enable mark classifier.
+ # #############################################################################
+-ECM_CLASSIFIER_MARK_ENABLE=y
+ifndef $(ECM_CLASSIFIER_MARK_ENABLE)
+	ECM_CLASSIFIER_MARK_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_MARK_ENABLE) += ecm_classifier_mark.o
+ ccflags-$(ECM_CLASSIFIER_MARK_ENABLE) += -DECM_CLASSIFIER_MARK_ENABLE
+ 
+@@ -247,7 +265,9 @@ ccflags-$(ECM_CLASSIFIER_NL_ENABLE) += -
+ # #############################################################################
+ # Define ECM_CLASSIFIER_DSCP_ENABLE=y in order to enable DSCP classifier.
+ # #############################################################################
+-ECM_CLASSIFIER_DSCP_ENABLE=y
+ifndef $(ECM_CLASSIFIER_DSCP_ENABLE)
+	ECM_CLASSIFIER_DSCP_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_DSCP_ENABLE) += ecm_classifier_dscp.o
+ ccflags-$(ECM_CLASSIFIER_DSCP_ENABLE) += -DECM_CLASSIFIER_DSCP_ENABLE
+ ccflags-$(ECM_CLASSIFIER_DSCP_IGS) += -DECM_CLASSIFIER_DSCP_IGS
+@@ -274,7 +294,9 @@ endif
+ # the Parental Controls subsystem classifier in ECM. Currently disabled until
+ # customers require it / if they need to integrate their Parental Controls with it.
+ # #############################################################################
+-ECM_CLASSIFIER_PCC_ENABLE=y
+ifndef $(ECM_CLASSIFIER_PCC_ENABLE)
+	ECM_CLASSIFIER_PCC_ENABLE=y
+endif
+ ecm-$(ECM_CLASSIFIER_PCC_ENABLE) += ecm_classifier_pcc.o
+ ccflags-$(ECM_CLASSIFIER_PCC_ENABLE) += -DECM_CLASSIFIER_PCC_ENABLE
+ 
+@@ -301,28 +323,36 @@ ccflags-$(ECM_NON_PORTED_SUPPORT_ENABLE)
+ # #############################################################################
+ # Define ECM_STATE_OUTPUT_ENABLE=y to support XML state output
+ # #############################################################################
+-ECM_STATE_OUTPUT_ENABLE=y
+ifndef $(ECM_STATE_OUTPUT_ENABLE)
+	ECM_STATE_OUTPUT_ENABLE=y
+endif
+ ecm-$(ECM_STATE_OUTPUT_ENABLE) += ecm_state.o
+ ccflags-$(ECM_STATE_OUTPUT_ENABLE) += -DECM_STATE_OUTPUT_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_DB_ADVANCED_STATS_ENABLE to support XML state output
+ # #############################################################################
+-ECM_DB_ADVANCED_STATS_ENABLE=y
+ifndef $(ECM_DB_ADVANCED_STATS_ENABLE)
+	ECM_DB_ADVANCED_STATS_ENABLE=y
+endif
+ ccflags-$(ECM_DB_ADVANCED_STATS_ENABLE) += -DECM_DB_ADVANCED_STATS_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y in order to enable
+ # the database to track relationships between objects.
+ # #############################################################################
+-ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y
+ifndef $(ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE)
+	ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE=y
+endif
+ ccflags-$(ECM_DB_CONNECTION_CROSS_REFERENCING_ENABLE) += -DECM_DB_XREF_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_TRACKER_DPI_SUPPORT_ENABLE=y in order to enable support for
+ # deep packet inspection and tracking of data with the trackers.
+ # #############################################################################
+-ECM_TRACKER_DPI_SUPPORT_ENABLE=y
+ifndef $(ECM_TRACKER_DPI_SUPPORT_ENABLE)
+	ECM_TRACKER_DPI_SUPPORT_ENABLE=y
+endif
+ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE) += -DECM_TRACKER_DPI_SUPPORT_ENABLE
+ 
+ # #############################################################################
+@@ -330,14 +360,18 @@ ccflags-$(ECM_TRACKER_DPI_SUPPORT_ENABLE
+ # support for the database keeping lists of connections that are assigned
+ # on a per TYPE of classifier basis.
+ # #############################################################################
+-ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE=y
+ifndef $(ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE)
+	ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE=y
+endif
+ ccflags-$(ECM_DB_CLASSIFIER_TYPE_ASSIGNMENTS_TRACK_ENABLE) += -DECM_DB_CTA_TRACK_ENABLE
+ 
+ # #############################################################################
+ # Define ECM_BAND_STEERING_ENABLE=y in order to enable
+ # band steering feature.
+ # #############################################################################
+-ECM_BAND_STEERING_ENABLE=y
+ifndef $(ECM_BAND_STEERING_ENABLE)
+	ECM_BAND_STEERING_ENABLE=y
+endif
+ ccflags-$(ECM_BAND_STEERING_ENABLE) += -DECM_BAND_STEERING_ENABLE
+ 
+ # #############################################################################
+--- a/ecm_db/ecm_db_connection.c
+++ b/ecm_db/ecm_db_connection.c
+@@ -430,7 +430,9 @@ EXPORT_SYMBOL(ecm_db_connection_make_def
+  */
+ void ecm_db_connection_data_totals_update(struct ecm_db_connection_instance *ci, bool is_from, uint64_t size, uint64_t packets)
+ {
+#ifdef ECM_DB_ADVANCED_STATS_ENABLE
+ 	int32_t i;
+#endif
+ 
+ 	DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
+ 
+@@ -529,7 +531,9 @@ EXPORT_SYMBOL(ecm_db_connection_data_tot
+  */
+ void ecm_db_connection_data_totals_update_dropped(struct ecm_db_connection_instance *ci, bool is_from, uint64_t size, uint64_t packets)
+ {
+#ifdef ECM_DB_ADVANCED_STATS_ENABLE
+ 	int32_t i;
+#endif
+ 
+ 	DEBUG_CHECK_MAGIC(ci, ECM_DB_CONNECTION_INSTANCE_MAGIC, "%px: magic failed\n", ci);
+ 
+@@ -1508,6 +1512,7 @@ void ecm_db_connection_defunct_all(void)
+ }
+ EXPORT_SYMBOL(ecm_db_connection_defunct_all);
+ 
+#ifdef ECM_INTERFACE_OVS_BRIDGE_ENABLE
+ /*
+  * ecm_db_connection_defunct_by_classifier()
+  *	Make defunct based on masked fields
+@@ -1667,6 +1672,7 @@ next_ci:
+ 				ECM_IP_ADDR_TO_OCTAL(dest_addr_mask), dest_port_mask, proto_mask, cnt);
+ 	}
+ }
+#endif
+ 
+ /*
+  * ecm_db_connection_defunct_by_port()
+@@ -1956,6 +1962,7 @@ struct ecm_db_node_instance *ecm_db_conn
+ }
+ EXPORT_SYMBOL(ecm_db_connection_node_get_and_ref);
+ 
+#ifdef ECM_DB_XREF_ENABLE
+ /*
+  * ecm_db_connection_mapping_get_and_ref_next()
+  *	Return reference to next connection in the mapping chain in the specified direction.
+@@ -1997,6 +2004,7 @@ struct ecm_db_connection_instance *ecm_d
+ 	return nci;
+ }
+ EXPORT_SYMBOL(ecm_db_connection_iface_get_and_ref_next);
+#endif
+ 
+ /*
+  * ecm_db_connection_mapping_get_and_ref()
+--- a/ecm_db/ecm_db_node.c
+++ b/ecm_db/ecm_db_node.c
+@@ -224,9 +224,11 @@ EXPORT_SYMBOL(ecm_db_node_get_and_ref_ne
+  */
+ int ecm_db_node_deref(struct ecm_db_node_instance *ni)
+ {
+#ifdef ECM_DB_XREF_ENABLE
+ #if (DEBUG_LEVEL >= 1)
+ 	int dir;
+ #endif
+#endif
+ 	DEBUG_CHECK_MAGIC(ni, ECM_DB_NODE_INSTANCE_MAGIC, "%px: magic failed\n", ni);
+ 
+ 	spin_lock_bh(&ecm_db_lock);
+@@ -486,9 +488,11 @@ EXPORT_SYMBOL(ecm_db_node_iface_get_and_
+ void ecm_db_node_add(struct ecm_db_node_instance *ni, struct ecm_db_iface_instance *ii, uint8_t *address,
+ 					ecm_db_node_final_callback_t final, void *arg)
+ {
+#ifdef ECM_DB_XREF_ENABLE
+ #if (DEBUG_LEVEL >= 1)
+ 	int dir;
+ #endif
+#endif
+ 	ecm_db_node_hash_t hash_index;
+ 	struct ecm_db_listener_instance *li;
+ 
+--- a/ecm_interface.c
+++ b/ecm_interface.c
+@@ -1343,6 +1343,7 @@ struct neighbour *ecm_interface_ipv6_nei
+  */
+ bool ecm_interface_is_pptp(struct sk_buff *skb, const struct net_device *out)
+ {
+#ifdef ECM_INTERFACE_PPTP_ENABLE
+ 	struct net_device *in;
+ 
+ 	/*
+@@ -1367,6 +1368,7 @@ bool ecm_interface_is_pptp(struct sk_buf
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -1379,6 +1381,7 @@ bool ecm_interface_is_pptp(struct sk_buf
+  */
+ bool ecm_interface_is_l2tp_packet_by_version(struct sk_buff *skb, const struct net_device *out, int ver)
+ {
+#ifdef ECM_INTERFACE_L2TPV2_PPTP_ENABLE
+ 	uint32_t flag = 0;
+ 	struct net_device *in;
+ 
+@@ -1411,6 +1414,7 @@ bool ecm_interface_is_l2tp_packet_by_ver
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -1423,6 +1427,7 @@ bool ecm_interface_is_l2tp_packet_by_ver
+  */
+ bool ecm_interface_is_l2tp_pptp(struct sk_buff *skb, const struct net_device *out)
+ {
+#ifdef ECM_INTERFACE_L2TPV2_PPTP_ENABLE
+ 	struct net_device *in;
+ 
+ 	/*
+@@ -1445,6 +1450,7 @@ bool ecm_interface_is_l2tp_pptp(struct s
+ 	}
+ 
+ 	dev_put(in);
+#endif
+ 	return false;
+ }
+ 
+@@ -6630,6 +6636,7 @@ static void ecm_interface_regenerate_con
+ 		return;
+ 	}
+ 
+#ifdef ECM_DB_XREF_ENABLE
+ 	for (dir = 0; dir < ECM_DB_OBJ_DIR_MAX; dir++) {
+ 		/*
+ 		 * Re-generate all connections associated with this interface
+@@ -6645,6 +6652,7 @@ static void ecm_interface_regenerate_con
+ 			ci[dir] = cin;
+ 		}
+ 	}
+#endif
+ 
+ #ifdef ECM_MULTICAST_ENABLE
+ 	/*
+--- a/frontends/ecm_front_end_common.c
+++ b/frontends/ecm_front_end_common.c
+@@ -106,6 +106,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 							     struct nf_conntrack_tuple *tuple,
+ 							     int ip_version)
+ {
+#ifdef ECM_INTERFACE_GRE_ENABLE
+ 	struct net_device *dev;
+ 	struct gre_base_hdr *greh;
+ 
+@@ -117,10 +118,12 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 		/*
+ 		 * Case 1: PPTP locally terminated
+ 		 */
+#ifdef ECM_INTERFACE_PPTP_ENABLE
+ 		if (ecm_interface_is_pptp(skb, outdev)) {
+ 			DEBUG_TRACE("%px: PPTP GRE locally terminated - allow acceleration\n", skb);
+ 			return true;
+ 		}
+#endif
+ 
+ 		/*
+ 		 * Case 2: PPTP pass through
+@@ -223,6 +226,10 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 	 */
+ 	DEBUG_TRACE("%px: GRE IPv%d pass through - allow acceleration\n", skb, ip_version);
+ 	return true;
+#else
+	DEBUG_TRACE("%px: GRE%d feature is disabled - do not allow acceleration\n", skb, ip_version);
+	return false;
+#endif
+ }
+ 
+ #ifdef ECM_CLASSIFIER_DSCP_ENABLE
--- a/qca/qca-nss-ecm/patches/100-kernel-5.10-support.patch
+++ b/qca/qca-nss-ecm/patches/100-kernel-5.10-support.patch
@ -0,0 +1,831 @@
+From e8b642c23af9146c973e828a7f4e0fb56cfc8d0b Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Sat, 15 May 2021 03:51:14 +0200
+Subject: [PATCH] add support for kernel 5.10
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ ecm_classifier_default.c                | 24 +++---------
+ ecm_classifier_dscp.c                   |  8 +---
+ ecm_classifier_emesh.c                  | 16 ++------
+ ecm_classifier_hyfi.c                   |  7 +---
+ ecm_classifier_mark.c                   |  8 +---
+ ecm_classifier_ovs.c                    |  8 +---
+ ecm_classifier_pcc.c                    |  8 +---
+ ecm_conntrack_notifier.c                |  8 +---
+ ecm_db/ecm_db_connection.c              |  7 +---
+ ecm_db/ecm_db_host.c                    |  7 +---
+ ecm_db/ecm_db_iface.c                   |  7 +---
+ ecm_db/ecm_db_mapping.c                 |  7 +---
+ ecm_db/ecm_db_node.c                    |  7 +---
+ ecm_interface.c                         |  4 +-
+ ecm_state.c                             | 14 ++-----
+ frontends/ecm_front_end_common.c        |  4 +-
+ frontends/ecm_front_end_ipv4.c          |  7 +---
+ frontends/ecm_front_end_ipv6.c          |  7 +---
+ frontends/nss/ecm_nss_bond_notifier.c   |  8 +---
+ frontends/nss/ecm_nss_ipv4.c            | 49 +++++++------------------
+ frontends/nss/ecm_nss_ipv6.c            | 49 +++++++------------------
+ frontends/nss/ecm_nss_multicast_ipv4.c  |  7 +---
+ frontends/nss/ecm_nss_multicast_ipv6.c  |  7 +---
+ frontends/nss/ecm_nss_non_ported_ipv4.c |  7 +---
+ frontends/nss/ecm_nss_non_ported_ipv6.c |  7 +---
+ frontends/nss/ecm_nss_ported_ipv4.c     |  8 +---
+ frontends/nss/ecm_nss_ported_ipv6.c     |  8 +---
+ frontends/sfe/ecm_sfe_ipv4.c            | 49 +++++++------------------
+ frontends/sfe/ecm_sfe_ipv6.c            | 49 +++++++------------------
+ frontends/sfe/ecm_sfe_non_ported_ipv4.c |  7 +---
+ frontends/sfe/ecm_sfe_non_ported_ipv6.c |  7 +---
+ frontends/sfe/ecm_sfe_ported_ipv4.c     |  8 +---
+ frontends/sfe/ecm_sfe_ported_ipv6.c     |  8 +---
+ 33 files changed, 122 insertions(+), 314 deletions(-)
+
+--- a/ecm_classifier_default.c
+++ b/ecm_classifier_default.c
+@@ -776,26 +776,14 @@ int ecm_classifier_default_init(struct d
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_default_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm deafult classifier enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_default_enabled);
+ 
+-	if (!debugfs_create_u32("accel_mode", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_default_accel_mode)) {
+-		DEBUG_ERROR("Failed to create ecm deafult classifier accel_mode file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("accel_mode", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_default_accel_mode);
+ 
+-	if (!debugfs_create_u32("accel_delay_pkts", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+-					(u32 *)&ecm_classifier_accel_delay_pkts)) {
+-		DEBUG_ERROR("Failed to create accel delay packet counts in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_default_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("accel_delay_pkts", S_IRUGO | S_IWUSR, ecm_classifier_default_dentry,
+					(u32 *)&ecm_classifier_accel_delay_pkts);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_dscp.c
+++ b/ecm_classifier_dscp.c
+@@ -747,12 +747,8 @@ int ecm_classifier_dscp_init(struct dent
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_dscp_dentry,
+-					(u32 *)&ecm_classifier_dscp_enabled)) {
+-		DEBUG_ERROR("Failed to create dscp enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_dscp_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_dscp_dentry,
+					(u32 *)&ecm_classifier_dscp_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_emesh.c
+++ b/ecm_classifier_emesh.c
+@@ -974,19 +974,11 @@ int ecm_classifier_emesh_init(struct den
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+-				(u32 *)&ecm_classifier_emesh_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm emesh classifier enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_emesh_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+				(u32 *)&ecm_classifier_emesh_enabled);
+ 
+-	if (!debugfs_create_u32("latency_config_enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+-				(u32 *)&ecm_classifier_emesh_latency_config_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm emesh classifier latency config enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_emesh_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("latency_config_enabled", S_IRUGO | S_IWUSR, ecm_classifier_emesh_dentry,
+				(u32 *)&ecm_classifier_emesh_latency_config_enabled);
+ 
+ 	/*
+ 	 * Register for service prioritization notification update.
+--- a/ecm_classifier_hyfi.c
+++ b/ecm_classifier_hyfi.c
+@@ -1099,11 +1099,8 @@ int ecm_classifier_hyfi_rules_init(struc
+ 		goto classifier_task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_hyfi_dentry,
+-					(u32 *)&ecm_classifier_hyfi_enabled)) {
+-		DEBUG_ERROR("Failed to create ecm hyfi classifier enabled file in debugfs\n");
+-		goto classifier_task_cleanup;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_hyfi_dentry,
+					(u32 *)&ecm_classifier_hyfi_enabled);
+ 
+ 	if (!debugfs_create_file("cmd", S_IWUSR, ecm_classifier_hyfi_dentry,
+ 					NULL, &ecm_classifier_hyfi_cmd_fops)) {
+--- a/ecm_classifier_mark.c
+++ b/ecm_classifier_mark.c
+@@ -753,12 +753,8 @@ int ecm_classifier_mark_init(struct dent
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_mark_dentry,
+-					(u32 *)&ecm_classifier_mark_enabled)) {
+-		DEBUG_ERROR("Failed to create mark enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_mark_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_mark_dentry,
+					(u32 *)&ecm_classifier_mark_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_ovs.c
+++ b/ecm_classifier_ovs.c
+@@ -2200,12 +2200,8 @@ int ecm_classifier_ovs_init(struct dentr
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_ovs_dentry,
+-					(u32 *)&ecm_classifier_ovs_enabled)) {
+-		DEBUG_ERROR("Failed to create ovs enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_ovs_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO | S_IWUSR, ecm_classifier_ovs_dentry,
+					(u32 *)&ecm_classifier_ovs_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_classifier_pcc.c
+++ b/ecm_classifier_pcc.c
+@@ -1308,12 +1308,8 @@ int ecm_classifier_pcc_init(struct dentr
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("enabled", S_IRUGO, ecm_classifier_pcc_dentry,
+-					(u32 *)&ecm_classifier_pcc_enabled)) {
+-		DEBUG_ERROR("Failed to create pcc enabled file in debugfs\n");
+-		debugfs_remove_recursive(ecm_classifier_pcc_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("enabled", S_IRUGO, ecm_classifier_pcc_dentry,
+					(u32 *)&ecm_classifier_pcc_enabled);
+ 
+ 	return 0;
+ }
+--- a/ecm_conntrack_notifier.c
+++ b/ecm_conntrack_notifier.c
+@@ -414,12 +414,8 @@ int ecm_conntrack_notifier_init(struct d
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_conntrack_notifier_dentry,
+-					(u32 *)&ecm_conntrack_notifier_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm conntrack notifier stopped file in debugfs\n");
+-		debugfs_remove_recursive(ecm_conntrack_notifier_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_conntrack_notifier_dentry,
+					(u32 *)&ecm_conntrack_notifier_stopped);
+ 
+ #ifdef CONFIG_NF_CONNTRACK_EVENTS
+ 	/*
+--- a/ecm_db/ecm_db_connection.c
+++ b/ecm_db/ecm_db_connection.c
+@@ -3642,11 +3642,8 @@ static struct file_operations ecm_db_con
+  */
+ bool ecm_db_connection_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("connection_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_connection_count)) {
+-		DEBUG_ERROR("Failed to create ecm db connection count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("connection_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_connection_count);
+ 
+ 	if (!debugfs_create_file("connection_count_simple", S_IRUGO, dentry,
+ 					NULL, &ecm_db_connection_count_simple_fops)) {
+--- a/ecm_db/ecm_db_host.c
+++ b/ecm_db/ecm_db_host.c
+@@ -770,11 +770,8 @@ EXPORT_SYMBOL(ecm_db_host_alloc);
+ bool ecm_db_host_init(struct dentry *dentry)
+ {
+ 
+-	if (!debugfs_create_u32("host_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_host_count)) {
+-		DEBUG_ERROR("Failed to create ecm db host count file in debugfs\n");
+-		return false;;
+-	}
+	debugfs_create_u32("host_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_host_count);
+ 
+ 	ecm_db_host_table = vzalloc(sizeof(struct ecm_db_host_instance *) * ECM_DB_HOST_HASH_SLOTS);
+ 	if (!ecm_db_host_table) {
+--- a/ecm_db/ecm_db_iface.c
+++ b/ecm_db/ecm_db_iface.c
+@@ -3670,11 +3670,8 @@ EXPORT_SYMBOL(ecm_db_iface_alloc);
+  */
+ bool ecm_db_iface_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("iface_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_iface_count)) {
+-		DEBUG_ERROR("Failed to create ecm db iface count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("iface_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_iface_count);
+ 
+ 	return true;
+ }
+--- a/ecm_db/ecm_db_mapping.c
+++ b/ecm_db/ecm_db_mapping.c
+@@ -806,11 +806,8 @@ EXPORT_SYMBOL(ecm_db_mapping_alloc);
+  */
+ bool ecm_db_mapping_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("mapping_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_mapping_count)) {
+-		DEBUG_ERROR("Failed to create ecm db mapping count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("mapping_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_mapping_count);
+ 
+ 	ecm_db_mapping_table = vzalloc(sizeof(struct ecm_db_mapping_instance *) * ECM_DB_MAPPING_HASH_SLOTS);
+ 	if (!ecm_db_mapping_table) {
+--- a/ecm_db/ecm_db_node.c
+++ b/ecm_db/ecm_db_node.c
+@@ -1187,11 +1187,8 @@ keep_sni_conn:
+  */
+ bool ecm_db_node_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("node_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_db_node_count)) {
+-		DEBUG_ERROR("Failed to create ecm db node count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("node_count", S_IRUGO, dentry,
+					(u32 *)&ecm_db_node_count);
+ 
+ 	ecm_db_node_table = vzalloc(sizeof(struct ecm_db_node_instance *) * ECM_DB_NODE_HASH_SLOTS);
+ 	if (!ecm_db_node_table) {
+--- a/ecm_interface.c
+++ b/ecm_interface.c
+@@ -332,7 +332,7 @@ static struct net_device *ecm_interface_
+ 	struct net_device *dev;
+ 
+ 	ECM_IP_ADDR_TO_NIN6_ADDR(addr6, addr);
+-	dev = (struct net_device *)ipv6_dev_find(&init_net, &addr6, 1);
+	dev = (struct net_device *)ipv6_dev_find_and_hold(&init_net, &addr6, 1);
+ 	return dev;
+ }
+ #endif
+@@ -734,7 +734,7 @@ static bool ecm_interface_mac_addr_get_i
+ 	 * Get the MAC address that corresponds to IP address given.
+ 	 */
+ 	ECM_IP_ADDR_TO_NIN6_ADDR(daddr, addr);
+-	local_dev = ipv6_dev_find(&init_net, &daddr, 1);
+	local_dev = ipv6_dev_find_and_hold(&init_net, &daddr, 1);
+ 	if (local_dev) {
+ 		DEBUG_TRACE("%pi6 is a local address\n", &daddr);
+ 		memcpy(mac_addr, dev->dev_addr, ETH_ALEN);
+--- a/ecm_state.c
+++ b/ecm_state.c
+@@ -899,17 +899,11 @@ int ecm_state_init(struct dentry *dentry
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("state_dev_major", S_IRUGO, ecm_state_dentry,
+-					(u32 *)&ecm_state_dev_major_id)) {
+-		DEBUG_ERROR("Failed to create ecm state dev major file in debugfs\n");
+-		goto init_cleanup;
+-	}
+	debugfs_create_u32("state_dev_major", S_IRUGO, ecm_state_dentry,
+					(u32 *)&ecm_state_dev_major_id);
+ 
+-	if (!debugfs_create_u32("state_file_output_mask", S_IRUGO | S_IWUSR, ecm_state_dentry,
+-					(u32 *)&ecm_state_file_output_mask)) {
+-		DEBUG_ERROR("Failed to create ecm state output mask file in debugfs\n");
+-		goto init_cleanup;
+-	}
+	debugfs_create_u32("state_file_output_mask", S_IRUGO | S_IWUSR, ecm_state_dentry,
+					(u32 *)&ecm_state_file_output_mask);
+ 
+ 	/*
+ 	 * Register a char device that we will use to provide a dump of our state
+--- a/frontends/ecm_front_end_common.c
+++ b/frontends/ecm_front_end_common.c
+@@ -192,7 +192,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 			return false;
+ 		}
+ 	} else {
+-		dev = ipv6_dev_find(&init_net, &(tuple->src.u3.in6), 1);
+		dev = ipv6_dev_find_and_hold(&init_net, &(tuple->src.u3.in6), 1);
+ 		if (dev) {
+ 			/*
+ 			 * Source IP address is local
+@@ -202,7 +202,7 @@ bool ecm_front_end_gre_proto_is_accel_al
+ 			return false;
+ 		}
+ 
+-		dev = ipv6_dev_find(&init_net, &(tuple->dst.u3.in6), 1);
+		dev = ipv6_dev_find_and_hold(&init_net, &(tuple->dst.u3.in6), 1);
+ 		if (dev) {
+ 			/*
+ 			 * Destination IP address is local
+--- a/frontends/ecm_front_end_ipv4.c
+++ b/frontends/ecm_front_end_ipv4.c
+@@ -376,11 +376,8 @@ void ecm_front_end_ipv4_stop(int num)
+  */
+ int ecm_front_end_ipv4_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("front_end_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv4_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv4 stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("front_end_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+			   (u32 *)&ecm_front_end_ipv4_stopped);
+ 
+ 	switch (ecm_front_end_type_get()) {
+ 	case ECM_FRONT_END_TYPE_NSS:
+--- a/frontends/ecm_front_end_ipv6.c
+++ b/frontends/ecm_front_end_ipv6.c
+@@ -255,11 +255,8 @@ void ecm_front_end_ipv6_stop(int num)
+  */
+ int ecm_front_end_ipv6_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("front_end_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv6_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv6 stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("front_end_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+			   (u32 *)&ecm_front_end_ipv6_stopped);
+ 
+ 	switch (ecm_front_end_type_get()) {
+ 	case ECM_FRONT_END_TYPE_NSS:
+--- a/frontends/nss/ecm_nss_bond_notifier.c
+++ b/frontends/nss/ecm_nss_bond_notifier.c
+@@ -240,12 +240,8 @@ int ecm_nss_bond_notifier_init(struct de
+ 		return -1;
+ 	}
+ 
+-	if (!debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_nss_bond_notifier_dentry,
+-					(u32 *)&ecm_nss_bond_notifier_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm bond notifier stopped file in debugfs\n");
+-		debugfs_remove_recursive(ecm_nss_bond_notifier_dentry);
+-		return -1;
+-	}
+	debugfs_create_u32("stop", S_IRUGO | S_IWUSR, ecm_nss_bond_notifier_dentry,
+					(u32 *)&ecm_nss_bond_notifier_stopped);
+ 
+ 	/*
+ 	 * Register Link Aggregation callbacks with the bonding driver
+--- a/frontends/nss/ecm_nss_ipv4.c
+++ b/frontends/nss/ecm_nss_ipv4.c
+@@ -2802,41 +2802,23 @@ int ecm_nss_ipv4_init(struct dentry *den
+ 		return result;
+ 	}
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+ 					NULL, &ecm_nss_ipv4_accel_limit_mode_fops)) {
+@@ -2867,11 +2849,8 @@ int ecm_nss_ipv4_init(struct dentry *den
+ 		goto task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+-					(u32 *)&ecm_nss_ipv4_vlan_passthrough_enable)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 vlan passthrough file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv4_dentry,
+					(u32 *)&ecm_nss_ipv4_vlan_passthrough_enable);
+ 
+ #ifdef ECM_NON_PORTED_SUPPORT_ENABLE
+ 	if (!ecm_nss_non_ported_ipv4_debugfs_init(ecm_nss_ipv4_dentry)) {
+--- a/frontends/nss/ecm_nss_ipv6.c
+++ b/frontends/nss/ecm_nss_ipv6.c
+@@ -2542,41 +2542,23 @@ int ecm_nss_ipv6_init(struct dentry *den
+ 		return result;
+ 	}
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+ 					NULL, &ecm_nss_ipv6_accel_limit_mode_fops)) {
+@@ -2607,11 +2589,8 @@ int ecm_nss_ipv6_init(struct dentry *den
+ 		goto task_cleanup;
+ 	}
+ 
+-	if (!debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+-					(u32 *)&ecm_nss_ipv6_vlan_passthrough_enable)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 vlan passthrough file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("vlan_passthrough_set", S_IRUGO | S_IWUSR, ecm_nss_ipv6_dentry,
+					(u32 *)&ecm_nss_ipv6_vlan_passthrough_enable);
+ 
+ #ifdef ECM_NON_PORTED_SUPPORT_ENABLE
+ 	if (!ecm_nss_non_ported_ipv6_debugfs_init(ecm_nss_ipv6_dentry)) {
+--- a/frontends/nss/ecm_nss_multicast_ipv4.c
+++ b/frontends/nss/ecm_nss_multicast_ipv4.c
+@@ -4139,11 +4139,8 @@ void ecm_nss_multicast_ipv4_stop(int num
+  */
+ int ecm_nss_multicast_ipv4_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("ecm_nss_multicast_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv4_mc_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv4 mc stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("ecm_nss_multicast_ipv4_stop", S_IRUGO | S_IWUSR, dentry,
+					(u32 *)&ecm_front_end_ipv4_mc_stopped);
+ 
+ 	/*
+ 	 * Register multicast update callback to MCS snooper
+--- a/frontends/nss/ecm_nss_multicast_ipv6.c
+++ b/frontends/nss/ecm_nss_multicast_ipv6.c
+@@ -3939,11 +3939,8 @@ void ecm_nss_multicast_ipv6_stop(int num
+  */
+ int ecm_nss_multicast_ipv6_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("ecm_nss_multicast_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+-					(u32 *)&ecm_front_end_ipv6_mc_stopped)) {
+-		DEBUG_ERROR("Failed to create ecm front end ipv6 mc stop file in debugfs\n");
+-		return -1;
+-	}
+	debugfs_create_u32("ecm_nss_multicast_ipv6_stop", S_IRUGO | S_IWUSR, dentry,
+					(u32 *)&ecm_front_end_ipv6_mc_stopped);
+ 
+ 	/*
+ 	 * Register multicast update callback to MCS snooper
+--- a/frontends/nss/ecm_nss_non_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv4.c
+@@ -2615,11 +2615,8 @@ done:
+  */
+ bool ecm_nss_non_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_nss_non_ported_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_nss_non_ported_ipv4_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_non_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_non_ported_ipv6.c
+@@ -2329,11 +2329,8 @@ done:
+  */
+ bool ecm_nss_non_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_nss_non_ported_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_nss_non_ported_ipv6_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_ported_ipv4.c
+@@ -2944,12 +2944,8 @@ bool ecm_nss_ported_ipv4_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/nss/ecm_nss_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_ported_ipv6.c
+@@ -2732,12 +2732,8 @@ bool ecm_nss_ported_ipv6_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ipv4.c
+++ b/frontends/sfe/ecm_sfe_ipv4.c
+@@ -1808,48 +1808,27 @@ int ecm_sfe_ipv4_init(struct dentry *den
+ 	}
+ 
+ #ifdef CONFIG_XFRM
+-	if (!debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_reject_acceleration_for_ipsec)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 reject_acceleration_for_ipsec file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_reject_acceleration_for_ipsec);
+ #endif
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+-					(u32 *)&ecm_sfe_ipv4_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv4_dentry,
+					(u32 *)&ecm_sfe_ipv4_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_sfe_ipv4_dentry,
+ 					NULL, &ecm_sfe_ipv4_accel_limit_mode_fops)) {
+--- a/frontends/sfe/ecm_sfe_ipv6.c
+++ b/frontends/sfe/ecm_sfe_ipv6.c
+@@ -1532,48 +1532,27 @@ int ecm_sfe_ipv6_init(struct dentry *den
+ 	}
+ 
+ #ifdef CONFIG_XFRM
+-	if (!debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_reject_acceleration_for_ipsec)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 reject_acceleration_for_ipsec file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("reject_acceleration_for_ipsec", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_reject_acceleration_for_ipsec);
+ #endif
+ 
+-	if (!debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_no_action_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 no_action_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("no_action_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_no_action_limit_default);
+ 
+-	if (!debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_driver_fail_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 driver_fail_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("driver_fail_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_driver_fail_limit_default);
+ 
+-	if (!debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_nack_limit_default)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 nack_limit_default file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("nack_limit_default", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_nack_limit_default);
+ 
+-	if (!debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 accelerated_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("accelerated_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_accelerated_count);
+ 
+-	if (!debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_pending_accel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 pending_accel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_accel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_pending_accel_count);
+ 
+-	if (!debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+-					(u32 *)&ecm_sfe_ipv6_pending_decel_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 pending_decel_count file in debugfs\n");
+-		goto task_cleanup;
+-	}
+	debugfs_create_u32("pending_decel_count", S_IRUGO, ecm_sfe_ipv6_dentry,
+					(u32 *)&ecm_sfe_ipv6_pending_decel_count);
+ 
+ 	if (!debugfs_create_file("accel_limit_mode", S_IRUGO | S_IWUSR, ecm_sfe_ipv6_dentry,
+ 					NULL, &ecm_sfe_ipv6_accel_limit_mode_fops)) {
+--- a/frontends/sfe/ecm_sfe_non_ported_ipv4.c
+++ b/frontends/sfe/ecm_sfe_non_ported_ipv4.c
+@@ -2284,11 +2284,8 @@ done:
+  */
+ bool ecm_sfe_non_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_sfe_non_ported_ipv4_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_sfe_non_ported_ipv4_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_non_ported_ipv6.c
+++ b/frontends/sfe/ecm_sfe_non_ported_ipv6.c
+@@ -2083,11 +2083,8 @@ done:
+  */
+ bool ecm_sfe_non_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	if (!debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+-					(u32 *)&ecm_sfe_non_ported_ipv6_accelerated_count)) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 non_ported_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+	debugfs_create_u32("non_ported_accelerated_count", S_IRUGO, dentry,
+					(u32 *)&ecm_sfe_non_ported_ipv6_accelerated_count);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ported_ipv4.c
+++ b/frontends/sfe/ecm_sfe_ported_ipv4.c
+@@ -2528,12 +2528,8 @@ bool ecm_sfe_ported_ipv4_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_sfe_ported_ipv4_accelerated_count[ECM_SFE_PORTED_IPV4_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv4 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_sfe_ported_ipv4_accelerated_count[ECM_SFE_PORTED_IPV4_PROTO_TCP]);
+ 
+ 	return true;
+ }
+--- a/frontends/sfe/ecm_sfe_ported_ipv6.c
+++ b/frontends/sfe/ecm_sfe_ported_ipv6.c
+@@ -2374,12 +2374,8 @@ bool ecm_sfe_ported_ipv6_debugfs_init(st
+ 		return false;
+ 	}
+ 
+-	if (!debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+-					&ecm_sfe_ported_ipv6_accelerated_count[ECM_SFE_PORTED_IPV6_PROTO_TCP])) {
+-		DEBUG_ERROR("Failed to create ecm sfe ipv6 tcp_accelerated_count file in debugfs\n");
+-		debugfs_remove(udp_dentry);
+-		return false;
+-	}
+	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+					&ecm_sfe_ported_ipv6_accelerated_count[ECM_SFE_PORTED_IPV6_PROTO_TCP]);
+ 
+ 	return true;
+ }
--- a/qca/qca-nss-ecm/patches/200-resolve-high-load.patch
+++ b/qca/qca-nss-ecm/patches/200-resolve-high-load.patch
@ -0,0 +1,61 @@
+From 6924b71ed809b37fffd74d6428a8ca83e5919746 Mon Sep 17 00:00:00 2001
+From: Dirk Buchwalder <buchwalder@posteo.de>
+Date: Sun, 27 Jun 2021 16:52:39 +0200
+Subject: [PATCH] qca-nss-ecm: resolve the cpu high load regarding ecm
+
+If using ECM, cpu load goes up (around 1.0) and stucks there.
+This is due to using uninterruptible sleep function,
+the patch changes this to interruptible sleep function.
+
+Signed-off-by: Dirk Buchwalder <buchwalder@posteo.de>
+---
+ frontends/nss/ecm_nss_ipv4.c | 4 ++--
+ frontends/nss/ecm_nss_ipv6.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/frontends/nss/ecm_nss_ipv4.c b/frontends/nss/ecm_nss_ipv4.c
+index e00553c..94b39cd 100644
+--- a/frontends/nss/ecm_nss_ipv4.c
+++ b/frontends/nss/ecm_nss_ipv4.c
+@@ -2471,7 +2471,7 @@ static void ecm_nss_ipv4_stats_sync_req_work(struct work_struct *work)
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv4_lock);
+ 
+-	usleep_range(ECM_NSS_IPV4_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV4_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV4_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2485,7 +2485,7 @@ static void ecm_nss_ipv4_stats_sync_req_work(struct work_struct *work)
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv4_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv4_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv4_next_req_time = ecm_nss_ipv4_roll_check_jiffies + ECM_NSS_IPV4_STATS_SYNC_PERIOD;
+diff --git a/frontends/nss/ecm_nss_ipv6.c b/frontends/nss/ecm_nss_ipv6.c
+index 82e739f..30af050 100644
+--- a/frontends/nss/ecm_nss_ipv6.c
+++ b/frontends/nss/ecm_nss_ipv6.c
+@@ -2210,7 +2210,7 @@ static void ecm_nss_ipv6_stats_sync_req_work(struct work_struct *work)
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv6_lock);
+ 
+-	usleep_range(ECM_NSS_IPV6_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV6_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV6_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2224,7 +2224,7 @@ static void ecm_nss_ipv6_stats_sync_req_work(struct work_struct *work)
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv6_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv6_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv6_next_req_time = ecm_nss_ipv6_roll_check_jiffies + ECM_NSS_IPV6_STATS_SYNC_PERIOD;
+-- 
+2.31.1
--- a/qca/qca-nss-ecm/patches/203-rework-nfct-notification.patch
+++ b/qca/qca-nss-ecm/patches/203-rework-nfct-notification.patch
@ -0,0 +1,25 @@
+--- a/ecm_conntrack_notifier.c
+++ b/ecm_conntrack_notifier.c
+@@ -421,7 +421,11 @@ int ecm_conntrack_notifier_init(struct d
+ 	/*
+ 	 * Eventing subsystem is available so we register a notifier hook to get fast notifications of expired connections
+ 	 */
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
+	result = nf_conntrack_register_chain_notifier(&init_net, &ecm_conntrack_notifier);
+#else
+ 	result = nf_conntrack_register_notifier(&init_net, &ecm_conntrack_notifier);
+#endif
+ 	if (result < 0) {
+ 		DEBUG_ERROR("Can't register nf notifier hook.\n");
+ 		debugfs_remove_recursive(ecm_conntrack_notifier_dentry);
+@@ -439,7 +443,9 @@ EXPORT_SYMBOL(ecm_conntrack_notifier_ini
+ void ecm_conntrack_notifier_exit(void)
+ {
+ 	DEBUG_INFO("ECM Conntrack Notifier exit\n");
+-#ifdef CONFIG_NF_CONNTRACK_EVENTS
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
+	nf_conntrack_unregister_chain_notifier(&init_net, &ecm_conntrack_notifier);
+#else
+ 	nf_conntrack_unregister_notifier(&init_net, &ecm_conntrack_notifier);
+ #endif
+ 	/*
--- a/qca/qca-nss-ecm/patches/204-More-compile-fixes.patch
+++ b/qca/qca-nss-ecm/patches/204-More-compile-fixes.patch
@ -0,0 +1,49 @@
+From e6d701c0d454d841366c556b2ef07a5203ffb35d Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Fri, 21 May 2021 21:41:31 +0200
+Subject: [PATCH] More compile fixes
+
+More runtime compile fixes.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+---
+ frontends/nss/ecm_nss_ported_ipv4.c | 12 +++---------
+ frontends/nss/ecm_nss_ported_ipv6.c | 12 +++---------
+ 2 files changed, 6 insertions(+), 18 deletions(-)
+
+--- a/frontends/nss/ecm_nss_ported_ipv4.c
+++ b/frontends/nss/ecm_nss_ported_ipv4.c
+@@ -2935,14 +2935,8 @@ done:
+  */
+ bool ecm_nss_ported_ipv4_debugfs_init(struct dentry *dentry)
+ {
+-	struct dentry *udp_dentry;
+-
+-	udp_dentry = debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+	debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+ 						&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_UDP]);
+-	if (!udp_dentry) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv4 udp_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+ 
+ 	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+ 					&ecm_nss_ported_ipv4_accelerated_count[ECM_NSS_PORTED_IPV4_PROTO_TCP]);
+--- a/frontends/nss/ecm_nss_ported_ipv6.c
+++ b/frontends/nss/ecm_nss_ported_ipv6.c
+@@ -2723,14 +2723,8 @@ done:
+  */
+ bool ecm_nss_ported_ipv6_debugfs_init(struct dentry *dentry)
+ {
+-	struct dentry *udp_dentry;
+-
+-	udp_dentry = debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+	debugfs_create_u32("udp_accelerated_count", S_IRUGO, dentry,
+ 						&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_UDP]);
+-	if (!udp_dentry) {
+-		DEBUG_ERROR("Failed to create ecm nss ipv6 udp_accelerated_count file in debugfs\n");
+-		return false;
+-	}
+ 
+ 	debugfs_create_u32("tcp_accelerated_count", S_IRUGO, dentry,
+ 					&ecm_nss_ported_ipv6_accelerated_count[ECM_NSS_PORTED_IPV6_PROTO_TCP]);
--- a/qca/qca-nss-ecm/patches/205-resolve-high-load.patch
+++ b/qca/qca-nss-ecm/patches/205-resolve-high-load.patch
@ -0,0 +1,55 @@
+From 6924b71ed809b37fffd74d6428a8ca83e5919746 Mon Sep 17 00:00:00 2001
+From: Dirk Buchwalder <buchwalder@posteo.de>
+Date: Sun, 27 Jun 2021 16:52:39 +0200
+Subject: [PATCH] qca-nss-ecm: resolve the cpu high load regarding ecm
+
+If using ECM, cpu load goes up (around 1.0) and stucks there.
+This is due to using uninterruptible sleep function,
+the patch changes this to interruptible sleep function.
+
+Signed-off-by: Dirk Buchwalder buchwalder@posteo.de
+---
+ frontends/nss/ecm_nss_ipv4.c | 4 ++--
+ frontends/nss/ecm_nss_ipv6.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/frontends/nss/ecm_nss_ipv4.c
+++ b/frontends/nss/ecm_nss_ipv4.c
+@@ -2471,7 +2471,7 @@ static void ecm_nss_ipv4_stats_sync_req_
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv4_lock);
+ 
+-	usleep_range(ECM_NSS_IPV4_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV4_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV4_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2485,7 +2485,7 @@ static void ecm_nss_ipv4_stats_sync_req_
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv4_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv4_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv4_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv4_next_req_time = ecm_nss_ipv4_roll_check_jiffies + ECM_NSS_IPV4_STATS_SYNC_PERIOD;
+--- a/frontends/nss/ecm_nss_ipv6.c
+++ b/frontends/nss/ecm_nss_ipv6.c
+@@ -2210,7 +2210,7 @@ static void ecm_nss_ipv6_stats_sync_req_
+ 	}
+ 	spin_unlock_bh(&ecm_nss_ipv6_lock);
+ 
+-	usleep_range(ECM_NSS_IPV6_STATS_SYNC_UDELAY - 100, ECM_NSS_IPV6_STATS_SYNC_UDELAY);
+	msleep_interruptible(ECM_NSS_IPV6_STATS_SYNC_UDELAY / 1000);
+ 
+ 	/*
+ 	 * If index is 0, we are starting a new round, but if we still have time remain
+@@ -2224,7 +2224,7 @@ static void ecm_nss_ipv6_stats_sync_req_
+ 		}
+ 
+ 		if (time_after(ecm_nss_ipv6_next_req_time, current_jiffies)) {
+-			msleep(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+			msleep_interruptible(jiffies_to_msecs(ecm_nss_ipv6_next_req_time - current_jiffies));
+ 		}
+ 		ecm_nss_ipv6_roll_check_jiffies = jiffies;
+ 		ecm_nss_ipv6_next_req_time = ecm_nss_ipv6_roll_check_jiffies + ECM_NSS_IPV6_STATS_SYNC_PERIOD;