| Message ID | Y5qY7x6la5TxZxzX@makrotopia.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 32f1002ed4851d9eb28ea1aba58757bd4b66e63b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v3] net: dsa: mt7530: remove redundant assignment | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 15 Dec 2022 03:47:59 +0000 you 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> > > [...] Here is the summary with links: - [net,v3] net: dsa: mt7530: remove redundant assignment https://git.kernel.org/netdev/net/c/32f1002ed485 You are awesome, thank you!
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> --- Changes since v2: correct commit title 'reduntant' -> 'redundant' Changes since v1: Use 12 chars for fixes tag, fix Russell's contact drivers/net/dsa/mt7530.c | 3 --- 1 file changed, 3 deletions(-) base-commit: 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91