[][MAC80211][hnat][Fix DL floodind issue for the C50 UDP BiDi test]
[Description]
Fix DL floodind issue for the C50 UDP BiDi test.
Scenario: LAN to WLAN
Topology: C50 port 9 <-> Switch LAN3 <-> WiFi <-> CS0 STA
C50 port 8 <-> Switch LAN2
When the test time is longer than 300 seconds, the MAC table of the
switch will be aged out. Therefore, the packet will be flooded to the
all backbone PCs that connect with switch.
If without this patch, the C50 might encounter DL flooding issue.
[Release-log]
N/A
Change-Id: I2d92999d1a2568ee6ca37b9a840dfe1424d281dd
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7367966
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9990-mt7622-backport-nf-hw-offload-framework-and-ups.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9990-mt7622-backport-nf-hw-offload-framework-and-ups.patch
index 7d4c5d6..a7dfc86 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9990-mt7622-backport-nf-hw-offload-framework-and-ups.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9990-mt7622-backport-nf-hw-offload-framework-and-ups.patch
@@ -6125,7 +6125,7 @@
index 000000000..ae1eb2656
--- /dev/null
+++ b/net/netfilter/xt_FLOWOFFLOAD.c
-@@ -0,0 +1,776 @@
+@@ -0,0 +1,785 @@
+/*
+ * Copyright (C) 2018-2021 Felix Fietkau <nbd@nbd.name>
+ *
@@ -6510,19 +6510,28 @@
+ return dev_fill_forward_path(dev, ha, stack);
+}
+
-+static int nf_dev_forward_path(struct nf_flow_route *route,
++static int nf_dev_forward_path(struct sk_buff *skb,
++ struct nf_flow_route *route,
+ const struct nf_conn *ct,
+ enum ip_conntrack_dir dir,
+ struct net_device **devs)
+{
+ const struct dst_entry *dst = route->tuple[dir].dst;
++ struct ethhdr *eth = eth_hdr(skb);
+ struct net_device_path_stack stack;
+ struct nf_forward_info info = {};
+ unsigned char ha[ETH_ALEN];
+ int i;
+
-+ if (nf_dev_fill_forward_path(route, dst, ct, dir, ha, &stack) >= 0)
++ if (nf_dev_fill_forward_path(route, dst, ct, dir, ha, &stack) >= 0) {
++ if (!(ct->status & IPS_NAT_MASK)) {
++ if (dir == IP_CT_DIR_ORIGINAL)
++ memcpy(info.h_source, eth->h_source, ETH_ALEN);
++ else if (dir == IP_CT_DIR_REPLY)
++ memcpy(info.h_source, eth->h_dest, ETH_ALEN);
++ }
+ nf_dev_path_info(&stack, &info, ha);
++ }
+
+ devs[!dir] = (struct net_device *)info.indev;
+ if (!info.indev)
@@ -6608,11 +6617,11 @@
+ nf_default_forward_path(route, this_dst, dir, devs);
+ nf_default_forward_path(route, other_dst, !dir, devs);
+
-+ if (route->tuple[dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH &&
++ if (route->tuple[dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH &&
+ route->tuple[!dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH) {
-+ if (nf_dev_forward_path(route, ct, dir, devs))
++ if (nf_dev_forward_path(skb, route, ct, dir, devs))
+ return -1;
-+ if (nf_dev_forward_path(route, ct, !dir, devs))
++ if (nf_dev_forward_path(skb, route, ct, !dir, devs))
+ return -1;
+ }
+
@@ -6639,10 +6648,10 @@
+ if (ret)
+ goto err_route_dir1;
+
-+ if (route->tuple[dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH &&
++ if (route->tuple[dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH &&
+ route->tuple[!dir].xmit_type == FLOW_OFFLOAD_XMIT_NEIGH) {
-+ if (nf_dev_forward_path(route, ct, dir, devs) ||
-+ nf_dev_forward_path(route, ct, !dir, devs)) {
++ if (nf_dev_forward_path(skb, route, ct, dir, devs) ||
++ nf_dev_forward_path(skb, route, ct, !dir, devs)) {
+ ret = -1;
+ goto err_route_dir2;
+ }