iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tx4939: use __ethtool_get_ksettings

Browse Source 
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Decotigny 2016-02-24 10:58:00 -08:00 committed by David S. Miller
parent 3f1ac7a700
commit 091a9277c6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/mips/txx9/generic/setup_tx4939.c
View File

@ -320,11 +320,12 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
#if IS_ENABLED(CONFIG_TC35815) #if IS_ENABLED(CONFIG_TC35815)
static u32 tx4939_get_eth_speed(struct net_device *dev) static u32 tx4939_get_eth_speed(struct net_device *dev)
{ {
struct ethtool_cmd cmd; struct ethtool_link_ksettings cmd;
if (__ethtool_get_settings(dev, &cmd))
if (__ethtool_get_link_ksettings(dev, &cmd))
return 100; /* default 100Mbps */ return 100; /* default 100Mbps */
return ethtool_cmd_speed(&cmd); return cmd.base.speed;
} }
static int tx4939_netdev_event(struct notifier_block *this, static int tx4939_netdev_event(struct notifier_block *this,