summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Decotigny <decot@googlers.com>2016-02-24 21:58:00 +0300
committerDavid S. Miller <davem@davemloft.net>2016-02-26 06:06:45 +0300
commit091a9277c69be8d9ae1debca4f3eb1fee82d366a (patch)
treec221538084af46b0df535414c42e8b069789ba07
parent3f1ac7a700d039c61d8d8b99f28d605d489a60cf (diff)
downloadlinux-091a9277c69be8d9ae1debca4f3eb1fee82d366a.tar.xz
tx4939: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/mips/txx9/generic/setup_tx4939.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index e3733cde50d6..402ac2ec7e83 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
#if IS_ENABLED(CONFIG_TC35815)
static u32 tx4939_get_eth_speed(struct net_device *dev)
{
- struct ethtool_cmd cmd;
- if (__ethtool_get_settings(dev, &cmd))
+ struct ethtool_link_ksettings cmd;
+
+ if (__ethtool_get_link_ksettings(dev, &cmd))
return 100; /* default 100Mbps */
- return ethtool_cmd_speed(&cmd);
+ return cmd.base.speed;
}
static int tx4939_netdev_event(struct notifier_block *this,