diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2021-11-27 16:34:13 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:51:14 +0100 |
| commit | e807574f7881d9ac3ab13bce7b41677d2ab7a4d7 (patch) | |
| tree | 1c8a0e57d98c0c0eb16a70533642bbf2bbca7a24 | |
| parent | 3fbe8a68eb009866166574820b3e05c5ad12b5e6 (diff) | |
net: all drivers update
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/pcs/pcs-rzn1-miic.c | 3 | ||||
| -rw-r--r-- | drivers/net/pcs/pcs-xpcs.c | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 91523ace1a1c..6985e1bf94f3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2980,7 +2980,7 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, priv->info->mac_port_get_caps(ds, port, config); } -static int mt753x_pcs_validate(struct phylink_pcs *pcs, +static int mt753x_pcs_validate(struct phylink_pcs *pcs, unsigned int mode, unsigned long *supported, const struct phylink_link_state *state) { diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index ad1dbc6d9ce5..c13986179521 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -3957,7 +3957,7 @@ static struct mvneta_port *mvneta_pcs_to_port(struct phylink_pcs *pcs) return container_of(pcs, struct mvneta_port, phylink_pcs); } -static int mvneta_pcs_validate(struct phylink_pcs *pcs, +static int mvneta_pcs_validate(struct phylink_pcs *pcs, unsigned int mode, unsigned long *supported, const struct phylink_link_state *state) { diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 77c6446ed842..9dead987153f 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -6214,7 +6214,7 @@ static const struct phylink_pcs_ops mvpp2_phylink_xlg_pcs_ops = { .pcs_config = mvpp2_xlg_pcs_config, }; -static int mvpp2_gmac_pcs_validate(struct phylink_pcs *pcs, +static int mvpp2_gmac_pcs_validate(struct phylink_pcs *pcs, unsigned int mode, unsigned long *supported, const struct phylink_link_state *state) { diff --git a/drivers/net/pcs/pcs-rzn1-miic.c b/drivers/net/pcs/pcs-rzn1-miic.c index 4bd66fdde367..f2da79591119 100644 --- a/drivers/net/pcs/pcs-rzn1-miic.c +++ b/drivers/net/pcs/pcs-rzn1-miic.c @@ -268,7 +268,8 @@ static void miic_link_up(struct phylink_pcs *pcs, unsigned int neg_mode, (MIIC_CONVCTRL_CONV_SPEED | MIIC_CONVCTRL_FULLD), val); } -static int miic_validate(struct phylink_pcs *pcs, unsigned long *supported, +static int miic_validate(struct phylink_pcs *pcs, unsigned int mode, + unsigned long *supported, const struct phylink_link_state *state) { if (phy_interface_mode_is_rgmii(state->interface) || diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 31f0beba638a..f3cccb459ecb 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -604,7 +604,8 @@ static void xpcs_resolve_pma(struct dw_xpcs *xpcs, } } -static int xpcs_validate(struct phylink_pcs *pcs, unsigned long *supported, +static int xpcs_validate(struct phylink_pcs *pcs, unsigned int mode, + unsigned long *supported, const struct phylink_link_state *state) { __ETHTOOL_DECLARE_LINK_MODE_MASK(xpcs_supported) = { 0, }; |