Re: [PATCH net-next v7 15/19] net: bridge: use __ethtool_get_ksettings
From: Stephen Hemminger <hidden>
Date: 2016-02-11 00:58:36
Also in:
linux-mips, lkml, netdev
On Sun, 7 Feb 2016 17:08:59 -0800 David Decotigny [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public.gmane.org> Signed-off-by: David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public.gmane.org> --- net/bridge/br_if.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index c367b3e..cafe4e6 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_ksettings ecmd; - if (!__ethtool_get_settings(dev, &ecmd)) { - switch (ethtool_cmd_speed(&ecmd)) { + if (!__ethtool_get_ksettings(dev, &ecmd)) { + switch (ecmd.parent.speed) { case SPEED_10000: return 2; case SPEED_1000:
Sure looks fine for bridge. This reminds me that bridge code needs to transition to this decade and do latest STP. Acked-by: Stephen Hemminger <redacted>