summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorSara Sharon <sara.sharon@intel.com>2018-02-19 14:48:37 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-02-19 14:53:10 +0100
commit95f3ce6a77893ac828ba841df44421620de4314b (patch)
tree373fcc32556931c2f432ae9b877111485a0f9fd6 /net/mac80211/sta_info.c
parentd78d9ee9d40aca4781d2c5334972544601a4c3a2 (diff)
downloadblackbird-op-linux-95f3ce6a77893ac828ba841df44421620de4314b.tar.gz
blackbird-op-linux-95f3ce6a77893ac828ba841df44421620de4314b.zip
mac80211: fix calling sleeping function in atomic context
sta_info_alloc can be called from atomic paths (such as RX path) so we need to call pcpu_alloc with the correct gfp. Fixes: c9c5962b56c1 ("mac80211: enable collecting station statistics per-CPU") Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 8d7e3732bb61..af0b608ee8ed 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -314,7 +314,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
if (ieee80211_hw_check(hw, USES_RSS)) {
sta->pcpu_rx_stats =
- alloc_percpu(struct ieee80211_sta_rx_stats);
+ alloc_percpu_gfp(struct ieee80211_sta_rx_stats, gfp);
if (!sta->pcpu_rx_stats)
goto free;
}
OpenPOWER on IntegriCloud