From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 23 Feb 2013 17:41:58 +0000 (+0000)
Subject: mac80211: fix monitor-only injection
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6dbdadcaa68e79a93cae2fbaca935df5255a0b62;p=openwrt%2Fstaging%2Frobimarko.git

mac80211: fix monitor-only injection

SVN-Revision: 35760
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 68f9ceba69..c6633af8a3 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -158,6 +158,15 @@
  			    TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
+@@ -107,7 +107,7 @@ void ieee80211_recalc_idle(struct ieee80
+ 
+ 	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) {
 @@ -436,7 +436,6 @@ int ieee80211_do_open(struct wireless_de
  	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
  	struct net_device *dev = wdev->netdev;