diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-18 08:36:58 +1000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-18 14:11:08 -0400 |
| commit | e98233a6192d75d695b0972dc955d6561e46964f (patch) | |
| tree | 62941fda62fddac2d59c901c754876fb23aeaa4a /drivers/net/ethernet/faraday/ftgmac100.c | |
| parent | Merge branch 'marvell-static-code-analysis' (diff) | |
| download | linux-dev-e98233a6192d75d695b0972dc955d6561e46964f.tar.xz linux-dev-e98233a6192d75d695b0972dc955d6561e46964f.zip | |
ftgmac100: Add ethtool n-way reset call
A non-wired up implementation accidentally made its way in
a previous patch (Make ring sizes configurable via ethtool).
This removes it and wires up the generic phy_ethtool_nway_reset
instead.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday/ftgmac100.c')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 2153c5bbdd12..4cdd25a5742d 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1045,13 +1045,6 @@ 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) -{ - if (!ndev->phydev) - return -ENXIO; - return phy_start_aneg(ndev->phydev); -} - static void ftgmac100_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ering) { @@ -1090,6 +1083,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 = phy_ethtool_nway_reset, .get_ringparam = ftgmac100_get_ringparam, .set_ringparam = ftgmac100_set_ringparam, }; |