Commit fa3df928 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

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: default avatarJiri Pirko <jpirko@redhat.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8aaebc6
...@@ -33,20 +33,18 @@ ...@@ -33,20 +33,18 @@
*/ */
static int port_cost(struct net_device *dev) static int port_cost(struct net_device *dev)
{ {
if (dev->ethtool_ops && dev->ethtool_ops->get_settings) { struct ethtool_cmd ecmd;
struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, };
if (!dev_ethtool_get_settings(dev, &ecmd)) {
if (!dev_ethtool_get_settings(dev, &ecmd)) { switch (ethtool_cmd_speed(&ecmd)) {
switch (ethtool_cmd_speed(&ecmd)) { case SPEED_10000:
case SPEED_10000: return 2;
return 2; case SPEED_1000:
case SPEED_1000: return 4;
return 4; case SPEED_100:
case SPEED_100: return 19;
return 19; case SPEED_10:
case SPEED_10: return 100;
return 100;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment