Skip to content

Commit d594cc6

Browse files
committed
wifi: mac80211: restore non-chanctx injection behaviour
During the transition to use channel contexts throughout, the ability to do injection while in monitor mode concurrent with another interface was lost, since the (virtual) monitor won't have a chanctx assigned in this scenario. It's harder to fix drivers that actually transitioned to using channel contexts themselves, such as mt76, but it's easy to do those that are (still) just using the emulation. Do that. Cc: stable@vger.kernel.org Link: https://bugzilla.kernel.org/show_bug.cgi?id=218763 Reported-and-tested-by: Oscar Alfonso Diaz <oscar.alfonso.diaz@gmail.com> Fixes: 0a44dfc ("wifi: mac80211: simplify non-chanctx drivers") Link: https://patch.msgid.link/20251216105242.18366-2-johannes@sipsolutions.net Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 6f38593 commit d594cc6

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

net/mac80211/tx.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,6 +2397,8 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
23972397

23982398
if (chanctx_conf)
23992399
chandef = &chanctx_conf->def;
2400+
else if (local->emulate_chanctx)
2401+
chandef = &local->hw.conf.chandef;
24002402
else
24012403
goto fail_rcu;
24022404

0 commit comments

Comments
 (0)