From 8457982c849215e734d9005bfa40cdca16da6b14 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 13 Jan 2013 22:10:14 +0000 Subject: mac80211: fix monitor mode injection git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35145 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/300-pending_work.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'package/mac80211') diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index a1204f751..4d288bf60 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 -- cgit v1.2.3