aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-13 22:10:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-13 22:10:14 +0000
commit58df48212c0a14713100aeb267d49557f4ee42ca (patch)
treeebaf1813b084486e36a604b1b4019d89ccb3f042
parent236c369a89b51896407398e493c32f3acf6d1c02 (diff)
downloadupstream-58df48212c0a14713100aeb267d49557f4ee42ca.tar.gz
upstream-58df48212c0a14713100aeb267d49557f4ee42ca.tar.bz2
upstream-58df48212c0a14713100aeb267d49557f4ee42ca.zip
mac80211: fix monitor mode injection
SVN-Revision: 35145
-rw-r--r--package/mac80211/patches/300-pending_work.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index a1204f7513..4d288bf602 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1915,3 +1915,20 @@
struct ar5416IniArray iniBank7;
struct ar5416IniArray iniAddac;
struct ar5416IniArray iniPcieSerdes;
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1677,10 +1677,10 @@ netdev_tx_t ieee80211_monitor_start_xmit
+ chanctx_conf =
+ rcu_dereference(tmp_sdata->vif.chanctx_conf);
+ }
+- if (!chanctx_conf)
+- goto fail_rcu;
+-
+- chan = chanctx_conf->def.chan;
++ if (chanctx_conf)
++ chan = chanctx_conf->def.chan;
++ else
++ chan = local->_oper_channel;
+
+ /*
+ * Frame injection is not allowed if beaconing is not allowed