summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2021-11-27 16:34:13 +0000
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2022-06-21 10:57:45 +0100
commit61d7512fdbe05e37202c3eeeac8016fe2d76bf2b (patch)
treea64c93a08fb6302d7527ca774c828af8244a0cc6
parent79e78bec9037e4079d382e6ba419dda1675ee053 (diff)
net: all drivers update
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/net/dsa/mt7530.c2
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c2
-rw-r--r--drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c2
-rw-r--r--drivers/net/pcs/pcs-xpcs.c3
4 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 9746f42c3762..996da14c7128 100644
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2903,7 +2903,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 87ec0eca1685..4d5b27757b52 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3896,7 +3896,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 fae6e9693323..7490564bed92 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6163,7 +6163,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-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 3872f689cf22..8b888ba0fba8 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -628,7 +628,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, };