From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 7 Jul 2010 13:02:46 +0000 (+0200)
Subject: NET: nl80211, fix lock imbalance and netdev referencing
X-Git-Tag: v2.6.36-rc1~571^2~107^2~95
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=60ea385ff279a18790a432d57a8302562aaa0f8d;hp=f148cfdd9bc29c133d5728d8e98815ba8c01752e;p=net-next-2.6.git

NET: nl80211, fix lock imbalance and netdev referencing

Stanse found that nl80211_set_wiphy imporperly handles a lock and netdev
reference and contains unreachable code. It is because there return statement
isntead of assignment to result variable. Fix that.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "John W. Linville" <linville@tuxdriver.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jouni Malinen <j@w1.fi>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a999fc15462..cea595e2ed4 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -877,7 +877,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
 		int idx, mbm = 0;
 
 		if (!rdev->ops->set_tx_power) {
-			return -EOPNOTSUPP;
+			result = -EOPNOTSUPP;
 			goto bad_res;
 		}