Commit aa7c6e5f authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller

bridge: avoid ethtool on non running interface

If bridge port is offline, don't call ethtool to query speed.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5dadddb
...@@ -67,20 +67,21 @@ void br_port_carrier_check(struct net_bridge_port *p) ...@@ -67,20 +67,21 @@ void br_port_carrier_check(struct net_bridge_port *p)
struct net_device *dev = p->dev; struct net_device *dev = p->dev;
struct net_bridge *br = p->br; struct net_bridge *br = p->br;
if (netif_carrier_ok(dev)) if (netif_running(dev) && netif_carrier_ok(dev))
p->path_cost = port_cost(dev); p->path_cost = port_cost(dev);
if (netif_running(br->dev)) { if (!netif_running(br->dev))
spin_lock_bh(&br->lock); return;
if (netif_carrier_ok(dev)) {
if (p->state == BR_STATE_DISABLED) spin_lock_bh(&br->lock);
br_stp_enable_port(p); if (netif_running(dev) && netif_carrier_ok(dev)) {
} else { if (p->state == BR_STATE_DISABLED)
if (p->state != BR_STATE_DISABLED) br_stp_enable_port(p);
br_stp_disable_port(p); } else {
} if (p->state != BR_STATE_DISABLED)
spin_unlock_bh(&br->lock); br_stp_disable_port(p);
} }
spin_unlock_bh(&br->lock);
} }
static void release_nbp(struct kobject *kobj) static void release_nbp(struct kobject *kobj)
......
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