On 04/12/2017 03:44 PM, Benjamin Herrenschmidt wrote:
> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
> ---
> drivers/net/ethernet/faraday/ftgmac100.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c
> b/drivers/net/ethernet/faraday/ftgmac100.c
> index 796b37e..bbeb8e7 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -1043,11 +1043,11 @@ static void ftgmac100_get_drvinfo(struct net_device
> *netdev,
> strlcpy(info->bus_info, dev_name(&netdev->dev), sizeof(info->bus_info));
> }
>
> -static int ftgmac100_nway_reset(struct net_device *ndev)
> +static int ftgmac100_nway_reset(struct net_device *netdev)
> {
> - if (!ndev->phydev)
> + if (!netdev->phydev)
> return -ENXIO;
> - return phy_start_aneg(ndev->phydev);
> + return phy_start_aneg(netdev->phydev);
Can you use phy_ethtool_nway_reset() which does that (and also checks if
phydev->drv is NULL which would be the case after an unbind).
> }
>
> static void ftgmac100_get_ringparam(struct net_device *netdev,
> @@ -1088,6 +1088,7 @@ static const struct ethtool_ops ftgmac100_ethtool_ops =
> {
> .get_link = ethtool_op_get_link,
> .get_link_ksettings = phy_ethtool_get_link_ksettings,
> .set_link_ksettings = phy_ethtool_set_link_ksettings,
> + .nway_reset = ftgmac100_nway_reset,
> .get_ringparam = ftgmac100_get_ringparam,
> .set_ringparam = ftgmac100_set_ringparam,
> };
>
--
Florian
