| Message ID | Y5ksCg/Rt/2ELVOG@makrotopia.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net,v2] net: dsa: mt7530: remove reduntant assignment | expand |
Frank Wunderlich has reported a typo in the commit title, and he is right: reduntant => redundant Please either fix this while merging or wait until I'll post v3 tomorrow. On Wed, Dec 14, 2022 at 01:51:06AM +0000, Daniel Golle wrote: > Russell King correctly pointed out that the MAC_2500FD capability is > already added for port 5 (if not in RGMII mode) and port 6 (which only > supports SGMII) by mt7531_mac_port_get_caps. Remove the reduntant > setting of this capability flag which was added by a previous commit. > > Fixes: e19de30d2080 ("net: dsa: mt7530: add support for in-band link status") > Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > --- > drivers/net/dsa/mt7530.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c > index e74c6b406172..908fa89444c9 100644 > --- a/drivers/net/dsa/mt7530.c > +++ b/drivers/net/dsa/mt7530.c > @@ -2919,9 +2919,6 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, > config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | > MAC_10 | MAC_100 | MAC_1000FD; > > - if ((priv->id == ID_MT7531) && mt753x_is_mac_port(port)) > - config->mac_capabilities |= MAC_2500FD; > - > /* This driver does not make use of the speed, duplex, pause or the > * advertisement in its mac_config, so it is safe to mark this driver > * as non-legacy. > > base-commit: 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 > -- > 2.39.0 > >
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index e74c6b406172..908fa89444c9 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2919,9 +2919,6 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000FD; - if ((priv->id == ID_MT7531) && mt753x_is_mac_port(port)) - config->mac_capabilities |= MAC_2500FD; - /* This driver does not make use of the speed, duplex, pause or the * advertisement in its mac_config, so it is safe to mark this driver * as non-legacy.
Russell King correctly pointed out that the MAC_2500FD capability is already added for port 5 (if not in RGMII mode) and port 6 (which only supports SGMII) by mt7531_mac_port_get_caps. Remove the reduntant setting of this capability flag which was added by a previous commit. Fixes: e19de30d2080 ("net: dsa: mt7530: add support for in-band link status") Reported-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- drivers/net/dsa/mt7530.c | 3 --- 1 file changed, 3 deletions(-) base-commit: 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91