diff options
| author | Johannes Berg | 2013-01-29 12:16:22 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-01-29 12:16:22 +0100 |
| commit | 448cd55c37dc3ea30705c4826ac3e7dbbcb74aa2 (patch) | |
| tree | ac1b09f416944e50119b31165d6c8bca47e6ca77 /net/mac80211/tx.c | |
| parent | 3b4797bce0050570e84bedd10e1b14e9320a3551 (diff) | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
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 b4a84146de0c..a2cb6a302cc7 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 |