diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-16 21:44:02 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-16 21:44:02 +0300 |
| commit | 54dbf3a57731da6e21c6e65bd1a7f9ee009708ca (patch) | |
| tree | bd29fa037930f1b57a39da03169fff2f63210a2b /drivers/net/ethernet/ethoc.c | |
| parent | fc3f9146cec6ced8866071f711aba3f356af65f6 (diff) | |
| parent | 13f0ac41095587a23176f169b7f4557418017ade (diff) | |
| download | linux-54dbf3a57731da6e21c6e65bd1a7f9ee009708ca.tar.xz | |
Merge branch 'nway-reset'
Florian Fainelli says:
====================
net: Implenent ethtool::nway_reset for a few drivers
This patch series depends on "net: phy: Centralize auto-negotation restart"
since it provides phy_ethtool_nway_reset as a helper function.
The drivers here already support PHYLIB, so there really is no reason why
restarting auto-negotiation would not be possible with these.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ethoc.c')
| -rw-r--r-- | drivers/net/ethernet/ethoc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c index c044667a0a25..6456c180114b 100644 --- a/drivers/net/ethernet/ethoc.c +++ b/drivers/net/ethernet/ethoc.c @@ -966,6 +966,7 @@ static int ethoc_set_ringparam(struct net_device *dev, const struct ethtool_ops ethoc_ethtool_ops = { .get_regs_len = ethoc_get_regs_len, .get_regs = ethoc_get_regs, + .nway_reset = phy_ethtool_nway_reset, .get_link = ethtool_op_get_link, .get_ringparam = ethoc_get_ringparam, .set_ringparam = ethoc_set_ringparam, |