nl80211: Fix AP-scan-in-STA-mode error path behavior
authorJouni Malinen <jouni@qca.qualcomm.com>
Wed, 14 Jan 2015 22:59:14 +0000 (00:59 +0200)
committerJouni Malinen <j@w1.fi>
Wed, 14 Jan 2015 22:59:14 +0000 (00:59 +0200)
If a second scan trigger attempt fails in STA mode, the error path was
supposed to restore the old mode that was in use before changing to STA
mode. However, wpa_driver_nl80211_set_mode() changes drv->nlmode on
success, so the recovery path needs to use the saved old_mode value
instead.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
src/drivers/driver_nl80211_scan.c

index c35b4d7..3911f48 100644 (file)
@@ -266,7 +266,7 @@ int wpa_driver_nl80211_scan(struct i802_bss *bss,
                                goto fail;
 
                        if (wpa_driver_nl80211_scan(bss, params)) {
-                               wpa_driver_nl80211_set_mode(bss, drv->nlmode);
+                               wpa_driver_nl80211_set_mode(bss, old_mode);
                                goto fail;
                        }