kernel: bump 5.4 to 5.4.81

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch

diff --git a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch
index 73dbcbe352f33bc6f4be0c0ac51b5f778c96c010..21424a3e4d8fea76577a22e5cb9d4808328f316c 100644 (file)
--- a/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch
+++ b/target/linux/generic/backport-5.4/746-v5.5-net-dsa-mv88e6xxx-Split-monitor-port-configuration.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2378,7 +2378,14 @@ static int mv88e6xxx_setup_upstream_port
+@@ -2380,7 +2380,14 @@ static int mv88e6xxx_setup_upstream_port
  
                if (chip->info->ops->set_egress_port) {
                        err = chip->info->ops->set_egress_port(chip,
@@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #define MV88E6XXX_CASCADE_PORT_MULTIPLE               0xf
 --- a/drivers/net/dsa/mv88e6xxx/global1.c
 +++ b/drivers/net/dsa/mv88e6xxx/global1.c
-@@ -263,7 +263,9 @@ int mv88e6250_g1_ieee_pri_map(struct mv8
+@@ -294,7 +294,9 @@ int mv88e6250_g1_ieee_pri_map(struct mv8
  /* Offset 0x1a: Monitor Control */
  /* Offset 0x1a: Monitor & MGMT Control on some devices */
  
@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  {
        u16 reg;
        int err;
-@@ -272,11 +274,20 @@ int mv88e6095_g1_set_egress_port(struct
+@@ -303,11 +305,20 @@ int mv88e6095_g1_set_egress_port(struct
        if (err)
                return err;
  
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return mv88e6xxx_g1_write(chip, MV88E6185_G1_MONITOR_CTL, reg);
  }
-@@ -310,17 +321,24 @@ static int mv88e6390_g1_monitor_write(st
+@@ -341,17 +352,24 @@ static int mv88e6390_g1_monitor_write(st
        return mv88e6xxx_g1_write(chip, MV88E6390_G1_MONITOR_MGMT_CTL, reg);
  }
  
@@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                return err;
 --- a/drivers/net/dsa/mv88e6xxx/global1.h
 +++ b/drivers/net/dsa/mv88e6xxx/global1.h
-@@ -288,8 +288,12 @@ int mv88e6095_g1_stats_set_histogram(str
+@@ -289,8 +289,12 @@ int mv88e6095_g1_stats_set_histogram(str
  int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);
  void mv88e6xxx_g1_stats_read(struct mv88e6xxx_chip *chip, int stat, u32 *val);
  int mv88e6xxx_g1_stats_clear(struct mv88e6xxx_chip *chip);