From: Andreea-Cristina Bernat Date: Fri, 22 Aug 2014 13:14:49 +0000 (+0300) Subject: mac80211: scan: Replace rcu_assign_pointer() with RCU_INIT_POINTER() X-Git-Tag: v3.18-rc1~52^2~133^2~4^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ad053a962f1e83597ec8388716619c7633a00ef1;p=~emulex%2Finfiniband.git mac80211: scan: Replace rcu_assign_pointer() with RCU_INIT_POINTER() The use of "rcu_assign_pointer()" is NULLing out the pointer. According to RCU_INIT_POINTER()'s block comment: "1. This use of RCU_INIT_POINTER() is NULLing out the pointer" it is better to use it instead of rcu_assign_pointer() because it has a smaller overhead. The following Coccinelle semantic patch was used: @@ @@ - rcu_assign_pointer + RCU_INIT_POINTER (..., NULL) Signed-off-by: Andreea-Cristina Bernat Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index a0a938145dc..a9bb6eb8c3e 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -1094,7 +1094,7 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata) if (rcu_access_pointer(local->sched_scan_sdata)) { ret = drv_sched_scan_stop(local, sdata); if (!ret) - rcu_assign_pointer(local->sched_scan_sdata, NULL); + RCU_INIT_POINTER(local->sched_scan_sdata, NULL); } out: mutex_unlock(&local->mtx);