From 9b3e77fbc002684e3e915d212299887807ee5219 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 1 Sep 2011 03:29:38 +0000
Subject: [PATCH] --- yaml --- r: 265741 b: refs/heads/master c:
 fa3df928e0878350ab0ddd1453bb85b056c726da h: refs/heads/master i:   265739:
 e70a471c3da4e3942fe151a35b7a84304cbd9ff9 v: v3

---
 [refs]                   |  2 +-
 trunk/net/bridge/br_if.c | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 637a233de70c..4276dc92b52d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8aaebc6b2a9c36dd9705adcb8f10d14b3d33f75
+refs/heads/master: fa3df928e0878350ab0ddd1453bb85b056c726da
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
index 2cdf0070419f..b365bba84d19 100644
--- a/trunk/net/bridge/br_if.c
+++ b/trunk/net/bridge/br_if.c
@@ -33,20 +33,18 @@
  */
 static int port_cost(struct net_device *dev)
 {
-	if (dev->ethtool_ops && dev->ethtool_ops->get_settings) {
-		struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
-
-		if (!dev_ethtool_get_settings(dev, &ecmd)) {
-			switch (ethtool_cmd_speed(&ecmd)) {
-			case SPEED_10000:
-				return 2;
-			case SPEED_1000:
-				return 4;
-			case SPEED_100:
-				return 19;
-			case SPEED_10:
-				return 100;
-			}
+	struct ethtool_cmd ecmd;
+
+	if (!dev_ethtool_get_settings(dev, &ecmd)) {
+		switch (ethtool_cmd_speed(&ecmd)) {
+		case SPEED_10000:
+			return 2;
+		case SPEED_1000:
+			return 4;
+		case SPEED_100:
+			return 19;
+		case SPEED_10:
+			return 100;
 		}
 	}