From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Tue, 27 Feb 2007 17:55:07 +0000 (-0800)
Subject: [BRIDGE]: Fix locking of set path cost.
X-Git-Tag: v2.6.21-rc3~149^2~4
X-Git-Url: http://git.rot13.org/?p=powerpc.git;a=commitdiff_plain;h=6548cda289b549ed60c35f16a0051609aeee2fd0

[BRIDGE]: Fix locking of set path cost.

This change goes with earlier change to get rid of
work queue for path cost. Now stp_set_path_cost does its own
locking. This is to allow it to call br_path_cost() which calls
ethtool interfaces (might sleep).

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 3ab153d3c5..147015fe5c 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -291,12 +291,11 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
 
-		spin_lock_bh(&br->lock);
 		if ((p = br_get_port(br, args[1])) == NULL)
 			ret = -EINVAL;
 		else
 			br_stp_set_path_cost(p, args[2]);
-		spin_unlock_bh(&br->lock);
+
 		return ret;
 	}