---

yaml --- r: 321463 b: refs/heads/master c: ba846a5 h: refs/heads/master i: 321461: 88e1bbc 321459: f4c87ae 321455: d2c2ae5 v: v3
git-mirror · Jul 30, 2012 · 36b10f7 · 36b10f7
1 parent 68146a6
commit 36b10f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb06702f023a0e7b1e6ebf9746f34b610ca0508
+refs/heads/master: ba846a502c6b3c0ff047861c891fd1afeed6e435
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -984,7 +984,6 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata)
 			kfree(local->sched_scan_ies.ie[i]);
 
 		drv_sched_scan_stop(local, sdata);
-		rcu_assign_pointer(local->sched_scan_sdata, NULL);
 	}
 out:
 	mutex_unlock(&local->mtx);