diff options
author | Yan-Hsuan Chuang <yhchuang@realtek.com> | 2018-10-22 23:24:44 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-11-09 02:56:12 -0500 |
commit | c752cac9db1b0c469db7ba9d17af4ba708984db5 (patch) | |
tree | b0bb03fd78cc8fcde0aeb0971afbaffde4dbbc0c /net | |
parent | 81c5dce2cd0bb0ecb61b6212410da5eb78cd8f79 (diff) |
mac80211: fix GFP_KERNEL under tasklet context
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 3bd3b5769797..a69ecfb212ed 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -3063,7 +3063,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) | |||
3063 | cfg80211_sta_opmode_change_notify(sdata->dev, | 3063 | cfg80211_sta_opmode_change_notify(sdata->dev, |
3064 | rx->sta->addr, | 3064 | rx->sta->addr, |
3065 | &sta_opmode, | 3065 | &sta_opmode, |
3066 | GFP_KERNEL); | 3066 | GFP_ATOMIC); |
3067 | goto handled; | 3067 | goto handled; |
3068 | } | 3068 | } |
3069 | case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: { | 3069 | case WLAN_HT_ACTION_NOTIFY_CHANWIDTH: { |
@@ -3100,7 +3100,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) | |||
3100 | cfg80211_sta_opmode_change_notify(sdata->dev, | 3100 | cfg80211_sta_opmode_change_notify(sdata->dev, |
3101 | rx->sta->addr, | 3101 | rx->sta->addr, |
3102 | &sta_opmode, | 3102 | &sta_opmode, |
3103 | GFP_KERNEL); | 3103 | GFP_ATOMIC); |
3104 | goto handled; | 3104 | goto handled; |
3105 | } | 3105 | } |
3106 | default: | 3106 | default: |