Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54dbf3a5 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents fc3f9146 13f0ac41

drivers/net/ethernet/ethoc.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/net/ethernet/marvell/mvneta.c

+1 −0
Original line number Diff line number Diff line
@@ -3811,6 +3811,7 @@ static const struct net_device_ops mvneta_netdev_ops = { 
};



const struct ethtool_ops mvneta_eth_tool_ops = {

	.nway_reset	= phy_ethtool_nway_reset,

	.get_link       = ethtool_op_get_link,

	.set_coalesce   = mvneta_ethtool_set_coalesce,

	.get_coalesce   = mvneta_ethtool_get_coalesce,

drivers/net/ethernet/marvell/mvpp2.c

+1 −0
Original line number Diff line number Diff line
@@ -5923,6 +5923,7 @@ static const struct net_device_ops mvpp2_netdev_ops = { 
};



static const struct ethtool_ops mvpp2_eth_tool_ops = {

	.nway_reset	= phy_ethtool_nway_reset,

	.get_link	= ethtool_op_get_link,

	.set_coalesce	= mvpp2_ethtool_set_coalesce,

	.get_coalesce	= mvpp2_ethtool_get_coalesce,

drivers/net/ethernet/marvell/pxa168_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -1393,6 +1393,7 @@ static void pxa168_get_drvinfo(struct net_device *dev, 


static const struct ethtool_ops pxa168_ethtool_ops = {

	.get_drvinfo	= pxa168_get_drvinfo,

	.nway_reset	= phy_ethtool_nway_reset,

	.get_link	= ethtool_op_get_link,

	.get_ts_info	= ethtool_op_get_ts_info,

	.get_link_ksettings = pxa168_get_link_ksettings,

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ static const struct ethtool_ops stmmac_ethtool_ops = { 
	.get_regs = stmmac_ethtool_gregs,

	.get_regs_len = stmmac_ethtool_get_regs_len,

	.get_link = ethtool_op_get_link,

	.nway_reset = phy_ethtool_nway_reset,

	.get_pauseparam = stmmac_get_pauseparam,

	.set_pauseparam = stmmac_set_pauseparam,

	.get_ethtool_stats = stmmac_get_ethtool_stats,