diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-13 22:10:14 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-13 22:10:14 +0000 |
| commit | b35a5a31cd7fc0738e2b7db489916d9e122790ad (patch) | |
| tree | 40cc8069768a330b6249b3aebbc98c5e27f71668 /package/mac80211/patches/300-pending_work.patch | |
| parent | dd62d0cc9cada0344037d6acbae8332add18b496 (diff) | |
| download | upstream-b35a5a31cd7fc0738e2b7db489916d9e122790ad.tar.gz upstream-b35a5a31cd7fc0738e2b7db489916d9e122790ad.tar.bz2 upstream-b35a5a31cd7fc0738e2b7db489916d9e122790ad.zip | |
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 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 |