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