mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-24 09:50:04 +00:00
Code Issues Releases Wiki Activity

br: remove redundant check and init

Browse source 
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>
This commit is contained in:
Jiri Pirko 2011-09-01 03:29:38 +00:00 committed by David S. Miller
parent e8aaebc6b2
commit fa3df928e0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/bridge/br_if.c
View file

@ -33,8 +33,7 @@
*/ */
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)) {
@ -48,7 +47,6 @@ static int port_cost(struct net_device *dev)
return 100; return 100;
} }
} }
}
/* Old silly heuristics based on name */ /* Old silly heuristics based on name */
if (!strncmp(dev->name, "lec", 3)) if (!strncmp(dev->name, "lec", 3))