projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f1ac7a
)
tx4939: use __ethtool_get_ksettings
author
David Decotigny
<
[email protected]
>
Wed, 24 Feb 2016 18:58:00 +0000
(10:58 -0800)
committer
David S. Miller
<
[email protected]
>
Fri, 26 Feb 2016 03:06:45 +0000
(22:06 -0500)
Signed-off-by: David Decotigny <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
arch/mips/txx9/generic/setup_tx4939.c
patch
|
blob
|
history
diff --git
a/arch/mips/txx9/generic/setup_tx4939.c
b/arch/mips/txx9/generic/setup_tx4939.c
index e3733cde50d6f5caa82fda165c7971946001a8ed..402ac2ec7e83490358f2a945247630e401acd41b 100644
(file)
--- 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,