mac80211: fix monitor mode injection

SVN-Revision: 35145
2013-01-13 22:10:14 +00:00 · 2013-01-13 22:10:14 +00:00 · 58df48212c
parent 236c369a89
commit 58df48212c
1 changed files with 17 additions and 0 deletions
--- 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