mac80211: fix warning in ieee80211_probe_client

The warning is spurious -- if !sta we always exit without using the
unassigned qos variable, and if we do find the sta we assign it.

Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c2416fbd1b27a3691ec341e745d54cdb2e8b94e7..1063a7e57d62a9d2cf68e965e71152c9f1eb3033 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/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 |