diff --git a/[refs] b/[refs]
index f21f6fbc2eba..524d1ca22122 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1196862b7926d5312c7f8e8eaecba658b6553ba0
+refs/heads/master: fe0b06b123762ab620b5bee3dab1576ddddd0a7f
diff --git a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
index 846c62db3c4c..290ddb0951d6 100644
--- a/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/trunk/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -178,6 +178,7 @@ int ieee80211softmac_start_scan_implementation(struct net_device *dev)
 	dprintk(PFX "Scanning %d channels\n", sm->scaninfo->number_channels);
 	sm->scaninfo->current_channel_idx = 0;
 	sm->scaninfo->started = 1;
+	sm->scaninfo->stop = 0;
 	INIT_COMPLETION(sm->scaninfo->finished);
 	schedule_work(&sm->scaninfo->softmac_scan);
 	spin_unlock_irqrestore(&sm->lock, flags);