diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2018-02-19 14:48:37 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-02-19 14:53:10 +0100 |
| commit | 95f3ce6a77893ac828ba841df44421620de4314b (patch) | |
| tree | 373fcc32556931c2f432ae9b877111485a0f9fd6 /net/mac80211 | |
| parent | d78d9ee9d40aca4781d2c5334972544601a4c3a2 (diff) | |
| download | op-kernel-dev-95f3ce6a77893ac828ba841df44421620de4314b.zip op-kernel-dev-95f3ce6a77893ac828ba841df44421620de4314b.tar.gz | |
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')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 8d7e373..af0b608 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; } |
