kernel: refresh patches for 6.18.20

Sole patch automatically rebased.

Build system: x86/64
Build-tested: x86/64-glibc
Run-tested: x86/64-glibc

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22643
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/generic/pending-6.18/711-04-net-dsa-qca8k-merge-host-fdb-for-multi-cpu.patch b/target/linux/generic/pending-6.18/711-04-net-dsa-qca8k-merge-host-fdb-for-multi-cpu.patch
index 60f0756eae9267f2ae92a47590705c43705b7d11..dd5d33614fe14ef0eb0fe674835af09e5e3c1bd9 100644 (file)
--- a/target/linux/generic/pending-6.18/711-04-net-dsa-qca8k-merge-host-fdb-for-multi-cpu.patch
+++ b/target/linux/generic/pending-6.18/711-04-net-dsa-qca8k-merge-host-fdb-for-multi-cpu.patch
@@ -21,7 +21,7 @@ Signed-off-by: Kevin Staley <glaciertablet@gmail.com>
 
 --- a/drivers/net/dsa/qca/qca8k-common.c
 +++ b/drivers/net/dsa/qca/qca8k-common.c
-@@ -836,6 +836,13 @@ int qca8k_port_fdb_add(struct dsa_switch
+@@ -829,6 +829,13 @@ int qca8k_port_fdb_add(struct dsa_switch
        struct qca8k_priv *priv = ds->priv;
        u16 port_mask = BIT(port);
  
@@ -35,7 +35,7 @@ Signed-off-by: Kevin Staley <glaciertablet@gmail.com>
        return qca8k_port_fdb_insert(priv, addr, port_mask, vid);
  }
  
-@@ -849,6 +856,9 @@ int qca8k_port_fdb_del(struct dsa_switch
+@@ -842,6 +849,9 @@ int qca8k_port_fdb_del(struct dsa_switch
        if (!vid)
                vid = QCA8K_PORT_VID_DEF;