aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-02-23 17:41:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-02-23 17:41:58 +0000
commitbdf131a754b72f55a3204a4f33a426fcaea738fb (patch)
tree545c8702b9ee03443bcfced57f87131803ab29c8
parent24e6548eea0d3c848938cd328ceffc20b16bbee0 (diff)
downloadupstream-bdf131a754b72f55a3204a4f33a426fcaea738fb.tar.gz
upstream-bdf131a754b72f55a3204a4f33a426fcaea738fb.tar.bz2
upstream-bdf131a754b72f55a3204a4f33a426fcaea738fb.zip
mac80211: fix monitor-only injection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35760 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch9
1 files changed, 9 insertions, 0 deletions
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;