diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2021-11-27 16:28:48 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-06-21 10:57:45 +0100 |
| commit | 79e78bec9037e4079d382e6ba419dda1675ee053 (patch) | |
| tree | ea3a7643eab6c165d966e7a4f39814345a154788 | |
| parent | a769530705ee315fee0e0d090b43d5c8fb66d6fb (diff) | |
net: phylink: pass mode into pcs_validate()
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/phy/phylink.c | 3 | ||||
| -rw-r--r-- | include/linux/phylink.h | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index bcb5e6e645fb..a44d3a9b8007 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -464,7 +464,8 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, unsigned int mode, /* Validate the link parameters with the PCS */ if (pcs->ops->pcs_validate) { - ret = pcs->ops->pcs_validate(pcs, supported, state); + ret = pcs->ops->pcs_validate(pcs, mode, supported, + state); if (ret < 0 || phylink_is_empty_linkmode(supported)) return -EINVAL; diff --git a/include/linux/phylink.h b/include/linux/phylink.h index d8fa19f24859..55459f058502 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -457,7 +457,8 @@ struct phylink_pcs { * (where necessary). */ struct phylink_pcs_ops { - int (*pcs_validate)(struct phylink_pcs *pcs, unsigned long *supported, + int (*pcs_validate)(struct phylink_pcs *pcs, unsigned int mode, + unsigned long *supported, const struct phylink_link_state *state); int (*pcs_enable)(struct phylink_pcs *pcs); void (*pcs_disable)(struct phylink_pcs *pcs); @@ -480,6 +481,7 @@ struct phylink_pcs_ops { /** * pcs_validate() - validate the link configuration. * @pcs: a pointer to a &struct phylink_pcs. + * @mode: link autonegotiation mode * @supported: ethtool bitmask for supported link modes. * @state: a const pointer to a &struct phylink_link_state. * @@ -493,8 +495,8 @@ struct phylink_pcs_ops { * not depend on the MAC. * Returns 0 if the link state can be supported but does depend on the MAC. */ -int pcs_validate(struct phylink_pcs *pcs, unsigned long *supported, - const struct phylink_link_state *state); +int pcs_validate(struct phylink_pcs *pcs, unsigned int mode, + unsigned long *supported, struct phylink_link_state *state); /** * pcs_enable() - enable the PCS. |