kernel: backport two fixes for MediaTek Ethernet driver

[openwrt/staging/dangole.git] / target / linux / generic / pending-5.15 / 736-01-net-ethernet-mtk_eth_soc-add-code-for-offloading-flo.patch

diff --git a/target/linux/generic/pending-5.15/736-01-net-ethernet-mtk_eth_soc-add-code-for-offloading-flo.patch b/target/linux/generic/pending-5.15/736-01-net-ethernet-mtk_eth_soc-add-code-for-offloading-flo.patch
index d648ba4dc7fb3c3cf04e4d66484af28ffd4b3de1..caee22d2e9ebd809e4ce6c4e4607cc7348835c08 100644 (file)
--- a/target/linux/generic/pending-5.15/736-01-net-ethernet-mtk_eth_soc-add-code-for-offloading-flo.patch
+++ b/target/linux/generic/pending-5.15/736-01-net-ethernet-mtk_eth_soc-add-code-for-offloading-flo.patch
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-@@ -235,7 +235,8 @@ out:
+@@ -237,7 +237,8 @@ out:
  }
  
  static int
@@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  {
        struct flow_rule *rule = flow_cls_offload_flow_rule(f);
        struct flow_action_entry *act;
-@@ -452,6 +453,7 @@ mtk_flow_offload_replace(struct mtk_eth
+@@ -454,6 +455,7 @@ mtk_flow_offload_replace(struct mtk_eth
        entry->cookie = f->cookie;
        memcpy(&entry->data, &foe, sizeof(entry->data));
        entry->wed_index = wed_index;
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        err = mtk_foe_entry_commit(eth->ppe[entry->ppe_index], entry);
        if (err < 0)
-@@ -520,25 +522,15 @@ mtk_flow_offload_stats(struct mtk_eth *e
+@@ -522,25 +524,15 @@ mtk_flow_offload_stats(struct mtk_eth *e
  
  static DEFINE_MUTEX(mtk_flow_offload_mutex);
  
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                break;
        case FLOW_CLS_DESTROY:
                err = mtk_flow_offload_destroy(eth, cls);
-@@ -556,6 +548,23 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_
+@@ -558,6 +550,23 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_
  }
  
  static int