diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-13 22:10:14 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-13 22:10:14 +0000 |
| commit | 8457982c849215e734d9005bfa40cdca16da6b14 (patch) | |
| tree | 40cc8069768a330b6249b3aebbc98c5e27f71668 /package/mac80211/patches/300-pending_work.patch | |
| parent | 317d13e2eb4c586c54f037cd9c54f1d30242adf9 (diff) | |
mac80211: fix monitor mode injection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35145 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/mac80211/patches/300-pending_work.patch | 17 |
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 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 |