target/linux/generic/backport-5.4/749-v5.5-net-dsa-mv88e6xxx-Fix-masking-of-egress-port.patch

   1 From 3ee339eb28959629db33aaa2b8cde4c63c6289eb Mon Sep 17 00:00:00 2001
   2 From: Andrew Lunn <andrew@lunn.ch>
   3 Date: Thu, 27 Feb 2020 21:20:49 +0100
   4 Subject: [PATCH] net: dsa: mv88e6xxx: Fix masking of egress port
   5
   6 Add missing ~ to the usage of the mask.
   7
   8 Reported-by: Kevin Benson <Kevin.Benson@zii.aero>
   9 Reported-by: Chris Healy <Chris.Healy@zii.aero>
  10 Fixes: 5c74c54ce6ff ("net: dsa: mv88e6xxx: Split monitor port configuration")
  11 Signed-off-by: Andrew Lunn <andrew@lunn.ch>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/dsa/mv88e6xxx/global1.c | 4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 --- a/drivers/net/dsa/mv88e6xxx/global1.c
  18 +++ b/drivers/net/dsa/mv88e6xxx/global1.c
  19 @@ -309,13 +309,13 @@ int mv88e6095_g1_set_egress_port(struct
  20         switch (direction) {
  21         case MV88E6XXX_EGRESS_DIR_INGRESS:
  22                 dest_port_chip = &chip->ingress_dest_port;
  23 -               reg &= MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK;
  24 +               reg &= ~MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK;
  25                 reg |= port <<
  26                        __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK);
  27                 break;
  28         case MV88E6XXX_EGRESS_DIR_EGRESS:
  29                 dest_port_chip = &chip->egress_dest_port;
  30 -               reg &= MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;
  31 +               reg &= ~MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;
  32                 reg |= port <<
  33                        __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);
  34                 break;