kernel: bump 5.4 to 5.4.81

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch

diff --git a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch
index e3346c12b9b665aaa49a6ea8a67daf791dc4ad95..30ff8aeab60f270838c5ffdd311d7f2747219d55 100644 (file)
--- a/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch
+++ b/target/linux/generic/backport-5.4/747-v5.5-net-dsa-mv88e6xxx-Add-support-for-port-mirroring.patch
@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -4920,6 +4920,80 @@ static int mv88e6xxx_port_mdb_del(struct
+@@ -4922,6 +4922,80 @@ static int mv88e6xxx_port_mdb_del(struct
        return err;
  }
  
@@ -106,7 +106,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,
                                         bool unicast, bool multicast)
  {
-@@ -4974,6 +5048,8 @@ static const struct dsa_switch_ops mv88e
+@@ -4976,6 +5050,8 @@ static const struct dsa_switch_ops mv88e
        .port_mdb_prepare       = mv88e6xxx_port_mdb_prepare,
        .port_mdb_add           = mv88e6xxx_port_mdb_add,
        .port_mdb_del           = mv88e6xxx_port_mdb_del,
@@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/dsa/mv88e6xxx/global1.c
 +++ b/drivers/net/dsa/mv88e6xxx/global1.c
-@@ -267,6 +267,7 @@ int mv88e6095_g1_set_egress_port(struct
+@@ -298,6 +298,7 @@ int mv88e6095_g1_set_egress_port(struct
                                 enum mv88e6xxx_egress_direction direction,
                                 int port)
  {
@@ -147,7 +147,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        u16 reg;
        int err;
  
-@@ -276,11 +277,13 @@ int mv88e6095_g1_set_egress_port(struct
+@@ -307,11 +308,13 @@ int mv88e6095_g1_set_egress_port(struct
  
        switch (direction) {
        case MV88E6XXX_EGRESS_DIR_INGRESS:
@@ -161,7 +161,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                reg &= MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;
                reg |= port <<
                       __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);
-@@ -289,7 +292,11 @@ int mv88e6095_g1_set_egress_port(struct
+@@ -320,7 +323,11 @@ int mv88e6095_g1_set_egress_port(struct
                return -EINVAL;
        }
  
@@ -174,7 +174,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  /* Older generations also call this the ARP destination. It has been
-@@ -325,14 +332,17 @@ int mv88e6390_g1_set_egress_port(struct
+@@ -356,14 +363,17 @@ int mv88e6390_g1_set_egress_port(struct
                                 enum mv88e6xxx_egress_direction direction,
                                 int port)
  {
@@ -192,7 +192,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST;
                break;
        default:
-@@ -340,10 +350,10 @@ int mv88e6390_g1_set_egress_port(struct
+@@ -371,10 +381,10 @@ int mv88e6390_g1_set_egress_port(struct
        }
  
        err = mv88e6390_g1_monitor_write(chip, ptr, port);