diff options
| author | David Decotigny <decot@googlers.com> | 2016-02-24 10:58:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-25 22:06:46 -0500 |
| commit | 702b26a24d3d012b9286efb3efbf2b81b23271f5 (patch) | |
| tree | 263110d7fcd809e80f9065108b842666890e8b8f /net/bridge/br_if.c | |
| parent | 577097981d72a034e4e2354881478cf202a9ba72 (diff) | |
| download | talos-op-linux-702b26a24d3d012b9286efb3efbf2b81b23271f5.tar.gz talos-op-linux-702b26a24d3d012b9286efb3efbf2b81b23271f5.zip | |
net: bridge: use __ethtool_get_ksettings
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index c367b3e1b5ac..b37a1cc97d98 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -36,10 +36,10 @@ */ static int port_cost(struct net_device *dev) { - struct ethtool_cmd ecmd; + struct ethtool_link_ksettings ecmd; - if (!__ethtool_get_settings(dev, &ecmd)) { - switch (ethtool_cmd_speed(&ecmd)) { + if (!__ethtool_get_link_ksettings(dev, &ecmd)) { + switch (ecmd.base.speed) { case SPEED_10000: return 2; case SPEED_1000: |
