---

yaml --- r: 277891 b: refs/heads/master c: b4487c2 h: refs/heads/master i: 277889: 4068f82 277887: 64ff422 v: v3
git-mirror · Nov 11, 2011 · 6d9853a · 6d9853a
1 parent b67618d
commit 6d9853a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 731f8e1c41a4d0ffb589e2395f931f8a1aa6c6a4
+refs/heads/master: b4487c2d0edaf1332d7a9f11b5661044955ef5e2
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
@@ -2570,12 +2570,13 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
 
 	rcu_read_lock();
 	sta = sta_info_get(sdata, peer);
-	if (sta)
+	if (sta) {
 		qos = test_sta_flag(sta, WLAN_STA_WME);
-	rcu_read_unlock();
-
-	if (!sta)
+		rcu_read_unlock();
+	} else {
+		rcu_read_unlock();
 		return -ENOLINK;
+	}
 
 	if (qos) {
 		fc = cpu_to_le16(IEEE80211_FTYPE_DATA |