summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorYan-Hsuan Chuang2018-10-23 05:24:44 +0200
committerGreg Kroah-Hartman2018-12-13 09:16:22 +0100
commite08ab93325bb23aba2111fc4ad1e06f5adba7cb2 (patch)
tree47c5ccd7b45116282422f75f1b5110cfdb55cc0e /net/mac80211
parentmac80211_hwsim: Timer should be initialized before device registered (diff)
downloadkernel-qcow2-linux-e08ab93325bb23aba2111fc4ad1e06f5adba7cb2.tar.gz
kernel-qcow2-linux-e08ab93325bb23aba2111fc4ad1e06f5adba7cb2.tar.xz
kernel-qcow2-linux-e08ab93325bb23aba2111fc4ad1e06f5adba7cb2.zip
mac80211: fix GFP_KERNEL under tasklet context
commit c752cac9db1b0c469db7ba9d17af4ba708984db5 upstream. cfg80211_sta_opmode_change_notify needs a gfp_t flag to hint the nl80211 stack when allocating new skb, but it is called under tasklet context here with GFP_KERNEL and kernel will yield a warning about it. Cc: stable@vger.kernel.org Fixes: ff84e7bfe176 ("mac80211: Add support to notify ht/vht opmode modification.") Signed-off-by: Yan-Hsuan Chuang <yhchuang@realtek.com> ACKed-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 96611d5dfadb..5ac7a0a49916 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3029,7 +3029,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
cfg80211_sta_opmode_change_notify(sdata->dev,
rx->sta->addr,
&sta_opmode,
- GFP_KERNEL);
+ GFP_ATOMIC);
goto handled;
}
case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: {
@@ -3066,7 +3066,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
cfg80211_sta_opmode_change_notify(sdata->dev,
rx->sta->addr,
&sta_opmode,
- GFP_KERNEL);
+ GFP_ATOMIC);
goto handled;
}
default: