diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
| commit | 38b587878eee8f9f2664135ab76805d0510bb997 (patch) | |
| tree | 66f5c8eb8821dc7fa1fe91741b24ff7291ef3bf1 /net/mac80211/tx.c | |
| parent | 323174b55ef1de0c70ed0b268fcaf9f2d6f842c6 (diff) | |
| parent | 24f70aa804cd7f8fee4353cf4990997d1c8375ae (diff) | |
Merge tag 'v4.9.90' into linux-linaro-lsk-v4.9lsk-v4.9-18.03
This is the 4.9.90 stable release
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1ffd1e145c13..84582998f65f 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4182,7 +4182,10 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, return bcn; shift = ieee80211_vif_get_shift(vif); - sband = hw->wiphy->bands[ieee80211_get_sdata_band(vif_to_sdata(vif))]; + sband = ieee80211_get_sband(vif_to_sdata(vif)); + if (!sband) + return bcn; + ieee80211_tx_monitor(hw_to_local(hw), copy, sband, 1, shift, false); return bcn; |