br: remove redundant check and init

Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 14 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2cdf0070419f..b365bba84d19 100644
--- a/net/bridge/br_if.c
+++ b/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;
                 }
         }