net: dsa: mt7530: set STP state on filter ID 1

As filter ID 1 is the only one used for bridges, set STP state on it.

Signed-off-by: DENG Qingfang <dqfext@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 606a9f4..9b39ccd 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1147,7 +1147,8 @@ mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)
                break;
        }
 
-       mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK, stp_state);
+       mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK(FID_BRIDGED),
+                  FID_PST(FID_BRIDGED, stp_state));
 }
 
 static int

diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
index d44640b..5b70cce 100644 (file)
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -186,8 +186,8 @@ enum mt7530_vlan_egress_attr {
 
 /* Register for port STP state control */
 #define MT7530_SSP_P(x)                        (0x2000 + ((x) * 0x100))
-#define  FID_PST(x)                    ((x) & 0x3)
-#define  FID_PST_MASK                  FID_PST(0x3)
+#define  FID_PST(fid, state)           (((state) & 0x3) << ((fid) * 2))
+#define  FID_PST_MASK(fid)             FID_PST(fid, 0x3)
 
 enum mt7530_stp_state {
        MT7530_STP_DISABLED = 0,