Merge 92ba6b439e6aed8557a315ebfcd350016159be52 into 9c8636081c413dcc08ea6ce8eb33a36798908a8e

common/nft.sh

@@ -263,6 +263,28 @@ nft_add_flow_offload_exemption()
 	[ "$DISABLE_IPV6" = "1" -o -z "$2" ] || nft_add_rule flow_offload oifname @wanif6 $2 ip6 daddr != @nozapret6 return comment \"$3\"
 }
 
+nft_hw_offload_supported()
+{
+	# $1,$2,... - interface names
+	local devices res=1
+	make_quoted_comma_list devices "$@"
+	[ -n "$devices" ] && devices="devices={$devices};"
+	nft add table ${ZAPRET_NFT_TABLE}_test && nft add flowtable ${ZAPRET_NFT_TABLE}_test ft "{ flags offload; $devices }" 2>/dev/null && res=0
+	nft delete table ${ZAPRET_NFT_TABLE}_test 2>/dev/null
+	return $res
+}
+
+nft_hw_offload_find_supported()
+{
+	# $1,$2,... - interface names
+	local supported_list
+	while [ -n "$1" ]; do
+		nft_hw_offload_supported "$1" && append_separator_list supported_list ' ' '' "$1"
+		shift
+	done
+	echo $supported_list
+}
+
 nft_apply_flow_offloading()
 {
 	# ft can be absent
@@ -348,15 +370,17 @@ flush set inet $ZAPRET_NFT_TABLE lanif"
 			nft_create_or_update_flowtable 'offload' 2>/dev/null
 			# then add elements. some of them can cause error because unsupported
 			for i in $ALLDEVS; do
-				# first try to add interface itself
+				if nft_hw_offload_supported $i; then
-				nft_create_or_update_flowtable 'offload' $i 2>/dev/null
+					nft_create_or_update_flowtable 'offload' $i
-				# bridge members must be added instead of the bridge itself
+				else
-				# some members may not support hw offload. example : lan1 lan2 lan3 support, wlan0 wlan1 - not
+					# bridge members must be added instead of the bridge itself
-				devs=$(resolve_lower_devices $i)
+					# some members may not support hw offload. example : lan1 lan2 lan3 support, wlan0 wlan1 - not
-				for j in $devs; do
+					devs=$(resolve_lower_devices $i)
-					# do not display error if addition failed
+					for j in $devs; do
-					nft_create_or_update_flowtable 'offload' $j 2>/dev/null
+						# do not display error if addition failed
-				done
+						nft_create_or_update_flowtable 'offload' $j 2>/dev/null
+					done
+				fi
 			done
 			;;
 	esac