From 36b10f73d02b74e4c2f8769d2ef8a76dd9975695 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 29 Jul 2012 16:25:10 +0300 Subject: [PATCH] --- yaml --- r: 321463 b: refs/heads/master c: ba846a502c6b3c0ff047861c891fd1afeed6e435 h: refs/heads/master i: 321461: 88e1bbcbbaba0e4bd3b7b64e2c07cbd094dd36d0 321459: f4c87ae1c20d5a66f31d7e455401fb153047a776 321455: d2c2ae51ee0d6654eb125fca80ef0babf9c205dc v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ae70427dba1..83729ae82e04 100644 --- 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 index df36280ed78f..839dd9737989 100644 --- 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);