generic: 5.15: qca8k: refresh backport patches

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-5.15 / 759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch

diff --git a/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch b/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch
index 41efa89b5e221ba67b3b348165449105ab36968b..877223b5d21feb98d490683d9ab20597697a1a1a 100644 (file)
--- a/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch
+++ b/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch
@@ -14,9 +14,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  drivers/net/dsa/qca8k.h |  1 +
  2 files changed, 12 insertions(+)
 
+diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
+index bedaaa6b9a1df..d988df913ae02 100644
 --- a/drivers/net/dsa/qca8k.c
 +++ b/drivers/net/dsa/qca8k.c
-@@ -1790,6 +1790,16 @@ qca8k_port_bridge_leave(struct dsa_switc
+@@ -1786,6 +1786,16 @@ qca8k_port_bridge_leave(struct dsa_switch *ds, int port, struct net_device *br)
                  QCA8K_PORT_LOOKUP_MEMBER, BIT(cpu_port));
  }
  
@@ -33,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int
  qca8k_port_enable(struct dsa_switch *ds, int port,
                  struct phy_device *phy)
-@@ -2005,6 +2015,7 @@ static const struct dsa_switch_ops qca8k
+@@ -1994,6 +2004,7 @@ static const struct dsa_switch_ops qca8k_switch_ops = {
        .port_stp_state_set     = qca8k_port_stp_state_set,
        .port_bridge_join       = qca8k_port_bridge_join,
        .port_bridge_leave      = qca8k_port_bridge_leave,
@@ -41,6 +43,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        .port_fdb_add           = qca8k_port_fdb_add,
        .port_fdb_del           = qca8k_port_fdb_del,
        .port_fdb_dump          = qca8k_port_fdb_dump,
+diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
+index 91c94dfc9789d..a533b8cf143be 100644
 --- a/drivers/net/dsa/qca8k.h
 +++ b/drivers/net/dsa/qca8k.h
 @@ -262,6 +262,7 @@ enum qca8k_fdb_cmd {
@@ -51,3 +55,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        QCA8K_FDB_NEXT = 6,
        QCA8K_FDB_SEARCH = 7,
  };
+-- 
+cgit 1.2.3-1.el7
+