From 29c2daa8860c08a49cf08d77a23ee625af9e5072 Mon Sep 17 00:00:00 2001 From: JoseCoW <88561480+JoseCoW@users.noreply.github.com> Date: Sat, 19 Mar 2022 19:43:16 +0800 Subject: [PATCH] =?UTF-8?q?net:=20ethernet=EF=BC=9Adrop=20duplicate=20patc?= =?UTF-8?q?hes=20(#9098)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重复的如下： https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L3-L10 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L3-L10 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L11-L22 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L11-L22 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L23-L37 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L23-L37 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L68-L77 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L38-L47 --- https://github.com/coolsnowwolf/lede/blob/ee9e1531054c6f75ce5d77716e3cd9865c4db897/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L78-L95 https://github.com/coolsnowwolf/lede/blob/a5d4d89136fd9078ceee6c378f84c65351c95197/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch#L48-L65 --- ...soc-add-ipv6-flow-offloading-support.patch | 6 +- ..._eth_soc-avoid-creating-duplicate-of.patch | 2 +- ...soc-add-ipv6-flow-offloading-support.patch | 65 ------------------- 3 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch diff --git a/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch b/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch index 26067c9dd..33859b6cc 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch @@ -65,7 +65,7 @@ mtk_flow_get_dsa_port(struct net_device **dev) { #if IS_ENABLED(CONFIG_NET_DSA) -@@ -254,6 +291,9 @@ mtk_flow_offload_replace(struct mtk_eth +@@ -251,6 +288,9 @@ mtk_flow_offload_replace(struct mtk_eth case FLOW_DISSECTOR_KEY_IPV4_ADDRS: offload_type = MTK_PPE_PKT_TYPE_IPV4_HNAPT; break; @@ -75,7 +75,7 @@ default: return -EOPNOTSUPP; } -@@ -289,6 +329,17 @@ mtk_flow_offload_replace(struct mtk_eth +@@ -286,6 +326,17 @@ mtk_flow_offload_replace(struct mtk_eth mtk_flow_set_ipv4_addr(&foe, &data, false); } @@ -93,7 +93,7 @@ flow_action_for_each(i, act, &rule->action) { if (act->id != FLOW_ACTION_MANGLE) continue; -@@ -301,6 +352,9 @@ mtk_flow_offload_replace(struct mtk_eth +@@ -289,6 +349,9 @@ mtk_flow_offload_replace(struct mtk_eth case FLOW_ACT_MANGLE_HDR_TYPE_IP4: err = mtk_flow_mangle_ipv4(act, &data); break; diff --git a/target/linux/generic/pending-5.10/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch b/target/linux/generic/pending-5.10/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch index ff090f07f..4be15a67b 100644 --- a/target/linux/generic/pending-5.10/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch +++ b/target/linux/generic/pending-5.10/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -@@ -187,6 +187,9 @@ mtk_flow_offload_replace(struct mtk_eth +@@ -224,6 +224,9 @@ mtk_flow_offload_replace(struct mtk_eth int hash; int i; diff --git a/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch b/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch deleted file mode 100644 index 7140c6877..000000000 --- a/target/linux/generic/pending-5.10/701-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -20,6 +21,11 @@ struct mtk_flow_data { - __be32 src_addr; - __be32 dst_addr; - } v4; -+ -+ struct { -+ struct in6_addr src_addr; -+ struct in6_addr dst_addr; -+ } v6; - }; - - __be16 src_port; -@@ -64,6 +70,14 @@ mtk_flow_set_ipv4_addr(struct mtk_foe_en - data->v4.dst_addr, data->dst_port); - } - -+static int -+mtk_flow_set_ipv6_addr(struct mtk_foe_entry *foe, struct mtk_flow_data *data) -+{ -+ return mtk_foe_entry_set_ipv6_tuple(foe, -+ data->v6.src_addr.s6_addr32, data->src_port, -+ data->v6.dst_addr.s6_addr32, data->dst_port); -+} -+ - static void - mtk_flow_offload_mangle_eth(const struct flow_action_entry *act, void *eth) - { -@@ -254,6 +268,9 @@ mtk_flow_offload_replace(struct mtk_eth - case FLOW_DISSECTOR_KEY_IPV4_ADDRS: - offload_type = MTK_PPE_PKT_TYPE_IPV4_HNAPT; - break; -+ case FLOW_DISSECTOR_KEY_IPV6_ADDRS: -+ offload_type = MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T; -+ break; - default: - return -EOPNOTSUPP; - } -@@ -289,6 +306,17 @@ mtk_flow_offload_replace(struct mtk_eth - mtk_flow_set_ipv4_addr(&foe, &data, false); - } - -+ if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) { -+ struct flow_match_ipv6_addrs addrs; -+ -+ flow_rule_match_ipv6_addrs(rule, &addrs); -+ -+ data.v6.src_addr = addrs.key->src; -+ data.v6.dst_addr = addrs.key->dst; -+ -+ mtk_flow_set_ipv6_addr(&foe, &data); -+ } -+ - flow_action_for_each(i, act, &rule->action) { - if (act->id != FLOW_ACTION_MANGLE) - continue;