From 6f85be7ce3fa31f378cda12c46b787dbfd1b6bc7 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 17 Feb 2020 16:23:31 +0000 Subject: net: phylink/dsa: fix DSA and CPU links Signed-off-by: Russell King --- net/dsa/port.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'net/dsa/port.c') diff --git a/net/dsa/port.c b/net/dsa/port.c index 376d02373e59..2938a1b93d4f 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -485,6 +485,22 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) return phydev; } +static void dsa_port_phylink_default_config(struct phylink_config *config, + struct phylink_link_state *state) +{ + struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); + struct dsa_switch *ds = dp->ds; + + if (dp->type == DSA_PORT_TYPE_USER || + !ds->ops->phylink_default_config) { + dev_err(ds->dev, "p%d: improper configuration for port\n", + dp->index); + return; + } + + ds->ops->phylink_default_config(ds, dp->index, state); +} + static void dsa_port_phylink_validate(struct phylink_config *config, unsigned long *supported, struct phylink_link_state *state) @@ -590,6 +606,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config, } const struct phylink_mac_ops dsa_port_phylink_mac_ops = { + .default_config = dsa_port_phylink_default_config, .validate = dsa_port_phylink_validate, .mac_pcs_get_state = dsa_port_phylink_mac_pcs_get_state, .mac_config = dsa_port_phylink_mac_config, -- cgit