kernel: move accepted mtk_eth_soc patches to generic-backport

[openwrt/staging/noltari.git] / target / linux / generic / pending-5.15 / 732-08-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch

diff --git a/target/linux/generic/pending-5.15/732-08-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch b/target/linux/generic/pending-5.15/732-08-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch
deleted file mode 100644 (file)
index 0478cb5..0000000
--- a/target/linux/generic/pending-5.15/732-08-net-dsa-add-support-for-DSA-rx-offloading-via-metada.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 8 Nov 2022 15:03:15 +0100
-Subject: [PATCH] net: dsa: add support for DSA rx offloading via
- metadata dst
-
-If a metadata dst is present with the type METADATA_HW_PORT_MUX on a dsa cpu
-port netdev, assume that it carries the port number and that there is no DSA
-tag present in the skb data.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -940,12 +940,14 @@ bool __skb_flow_dissect(const struct net
- #if IS_ENABLED(CONFIG_NET_DSA)
-               if (unlikely(skb->dev && netdev_uses_dsa(skb->dev) &&
-                            proto == htons(ETH_P_XDSA))) {
-+                      struct metadata_dst *md_dst = skb_metadata_dst(skb);
-                       const struct dsa_device_ops *ops;
-                       int offset = 0;
- 
-                       ops = skb->dev->dsa_ptr->tag_ops;
-                       /* Only DSA header taggers break flow dissection */
--                      if (ops->needed_headroom) {
-+                      if (ops->needed_headroom &&
-+                          (!md_dst || md_dst->type != METADATA_HW_PORT_MUX)) {
-                               if (ops->flow_dissect)
-                                       ops->flow_dissect(skb, &proto, &offset);
-                               else
---- a/net/dsa/dsa.c
-+++ b/net/dsa/dsa.c
-@@ -20,6 +20,7 @@
- #include <linux/phy_fixed.h>
- #include <linux/ptp_classify.h>
- #include <linux/etherdevice.h>
-+#include <net/dst_metadata.h>
- 
- #include "dsa_priv.h"
- 
-@@ -225,6 +226,7 @@ static bool dsa_skb_defer_rx_timestamp(s
- static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
-                         struct packet_type *pt, struct net_device *unused)
- {
-+      struct metadata_dst *md_dst = skb_metadata_dst(skb);
-       struct dsa_port *cpu_dp = dev->dsa_ptr;
-       struct sk_buff *nskb = NULL;
-       struct dsa_slave_priv *p;
-@@ -238,7 +240,22 @@ static int dsa_switch_rcv(struct sk_buff
-       if (!skb)
-               return 0;
- 
--      nskb = cpu_dp->rcv(skb, dev);
-+      if (md_dst && md_dst->type == METADATA_HW_PORT_MUX) {
-+              unsigned int port = md_dst->u.port_info.port_id;
-+
-+              skb_dst_drop(skb);
-+              if (!skb_has_extensions(skb))
-+                      skb->slow_gro = 0;
-+
-+              skb->dev = dsa_master_find_slave(dev, 0, port);
-+              if (likely(skb->dev)) {
-+                      dsa_default_offload_fwd_mark(skb);
-+                      nskb = skb;
-+              }
-+      } else {
-+              nskb = cpu_dp->rcv(skb, dev);
-+      }
-+
-       if (!nskb) {
-               kfree_skb(skb);
-               return 0;