From: David Decotigny <decot@googlers.com>
Date: Wed, 24 Feb 2016 18:58:09 +0000 (-0800)
Subject: net: bridge: use __ethtool_get_ksettings
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=702b26a24d3d012b9286efb3efbf2b81b23271f5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

net: bridge: use __ethtool_get_ksettings

Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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: