Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/bridge/br_if.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -67,12 +67,14 @@ 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))

		return;



	spin_lock_bh(&br->lock);

	spin_lock_bh(&br->lock);

		if (netif_carrier_ok(dev)) {

	if (netif_running(dev) && netif_carrier_ok(dev)) {

		if (p->state == BR_STATE_DISABLED)

		if (p->state == BR_STATE_DISABLED)

			br_stp_enable_port(p);

			br_stp_enable_port(p);

	} else {

	} else {
@@ -81,7 +83,6 @@ void br_port_carrier_check(struct net_bridge_port *p) 
	}

	}

	spin_unlock_bh(&br->lock);

	spin_unlock_bh(&br->lock);

}

}

}





static void release_nbp(struct kobject *kobj)

static void release_nbp(struct kobject *kobj)

{

{