diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2018-06-19 10:39:50 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-24 13:06:53 +0200 |
| commit | 60ce4457d489d2a670dc3b490fddbbded1d89e94 (patch) | |
| tree | 15e3eafeed0dd5ea8c463cec97159b0d84e4254c | |
| parent | 9fa54035165df43f8f57542eb0bafd331df57121 (diff) | |
mac80211: disable BHs/preemption in ieee80211_tx_control_port()
[ Upstream commit e7441c9274a6a5453e06f4c2b8b5f72eca0a3f17 ]
On pre-emption enabled kernels the following print was being seen due to
missing local_bh_disable/local_bh_enable calls. mac80211 assumes that
pre-emption is disabled in the data path.
BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
[...]
Call Trace:
dump_stack+0x5c/0x80
check_preemption_disabled.cold.0+0x46/0x51
__ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
Fixes: 911806491425 ("mac80211: Add support for tx_control_port")
Signed-off-by: Denis Kenzior <denkenz@gmail.com>
[commit message rewrite, fixes tag]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 05a265cd573d..7404a5114597 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4800,7 +4800,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, skb_reset_network_header(skb); skb_reset_mac_header(skb); + local_bh_disable(); __ieee80211_subif_start_xmit(skb, skb->dev, flags); + local_bh_enable(); return 0; } |