diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-22 14:23:13 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-22 14:23:13 -0500 |
| commit | ead0ad1648990638e624f57d446f1fa4c577d87d (patch) | |
| tree | 674063d85501781b4aeaf8e4f97a965a22cdfa3e /net/mac80211/tx.c | |
| parent | cb4ec37d485b05decf4bdcd11724362c7f03606a (diff) | |
| parent | 8680451f38a64bd270233b3c0eeb7c45f2b5efe3 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e9eadc40c09..467c1d1b66f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1673,10 +1673,13 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, 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 if (!local->use_chanctx) + chan = local->_oper_channel; + else + goto fail_rcu; /* * Frame injection is not allowed if beaconing is not allowed |