Messages in this thread Patch in this message | | | From | David Decotigny <> | Subject | [PATCH net-next v1 05/18] net: tx4939: use __ethtool_get_ksettings | Date | Mon, 26 Jan 2015 17:36:01 -0800 |
| |
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com> --- arch/mips/txx9/generic/setup_tx4939.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c index e3733cd..4a3ebf6 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_ksettings cmd; + + if (__ethtool_get_ksettings(dev, &cmd)) return 100; /* default 100Mbps */ - return ethtool_cmd_speed(&cmd); + return cmd.parent.speed; } static int tx4939_netdev_event(struct notifier_block *this, -- 2.2.0.rc0.207.ga3a616c
| |