* [PATCH 3.9] mac80211: fix idle handling in monitor mode
@ 2013-02-23 17:40 Felix Fietkau
2013-02-26 20:53 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Felix Fietkau @ 2013-02-23 17:40 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes
When the driver does not want a monitor mode VIF, no channel context is
allocated for it. This causes ieee80211_recalc_idle to put the hardware
into idle mode if only a monitor mode is active, breaking injection.
Fix this by checking local->monitors in addition to active channel
contexts.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
net/mac80211/iface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 2c059e5..640afab 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -107,7 +107,7 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
lockdep_assert_held(&local->mtx);
- active = !list_empty(&local->chanctx_list);
+ active = !list_empty(&local->chanctx_list) || local->monitors;
if (!local->ops->remain_on_channel) {
list_for_each_entry(roc, &local->roc_list, list) {
--
1.8.0.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3.9] mac80211: fix idle handling in monitor mode
2013-02-23 17:40 [PATCH 3.9] mac80211: fix idle handling in monitor mode Felix Fietkau
@ 2013-02-26 20:53 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2013-02-26 20:53 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless
On Sat, 2013-02-23 at 18:40 +0100, Felix Fietkau wrote:
> When the driver does not want a monitor mode VIF, no channel context is
> allocated for it. This causes ieee80211_recalc_idle to put the hardware
> into idle mode if only a monitor mode is active, breaking injection.
>
> Fix this by checking local->monitors in addition to active channel
> contexts.
Applied.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-26 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-23 17:40 [PATCH 3.9] mac80211: fix idle handling in monitor mode Felix Fietkau
2013-02-26 20:53 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).