diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-06-30 13:25:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-30 23:03:26 +0300 |
| commit | ab017b7921d3242dd2fb04fce77680e88d97477e (patch) | |
| tree | b23d76a7fe2a2d6699596043a2ca819783403c0d /drivers/net/dsa | |
| parent | 3cad1c8b49e93c62f27f4eb34e0ccfde92f4cdc0 (diff) | |
| download | linux-ab017b7921d3242dd2fb04fce77680e88d97477e.tar.xz | |
net: dsa/b53: use resolved link config in mac_link_up()
Convert the B53 driver to use the finalised link parameters in
mac_link_up() rather than the parameters in mac_config(). This is
just a matter of moving the call to b53_force_port_config().
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 8a7fa6092b01..6500179c2ca2 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1254,17 +1254,9 @@ void b53_phylink_mac_config(struct dsa_switch *ds, int port, { struct b53_device *dev = ds->priv; - if (mode == MLO_AN_PHY) + if (mode == MLO_AN_PHY || mode == MLO_AN_FIXED) return; - if (mode == MLO_AN_FIXED) { - b53_force_port_config(dev, port, state->speed, - state->duplex, - !!(state->pause & MLO_PAUSE_TX), - !!(state->pause & MLO_PAUSE_RX)); - return; - } - if ((phy_interface_mode_is_8023z(state->interface) || state->interface == PHY_INTERFACE_MODE_SGMII) && dev->ops->serdes_config) @@ -1314,6 +1306,8 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port, return; if (mode == MLO_AN_FIXED) { + b53_force_port_config(dev, port, speed, duplex, + tx_pause, rx_pause); b53_force_link(dev, port, true); return; } |