diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-20 11:53:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-20 11:53:20 -0400 |
commit | 7eb2450a51ea7606fa69ae4bb2113e0f228223cc (patch) | |
tree | 6cd273487574edd2da40ce14b1981e14a5171caa /net/mac80211/rx.c | |
parent | 474a41e94dfc85167e1761bfbb8bf180f90633b2 (diff) | |
parent | 73fb08e24ae840bc518facc2c605dd6bb3751fec (diff) | |
download | linux-stable-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.gz linux-stable-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.tar.bz2 linux-stable-7eb2450a51ea7606fa69ae4bb2113e0f228223cc.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5b617660b0ba..216c45b949e5 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -333,6 +333,8 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, /* in VHT, STBC is binary */ if (status->flag & RX_FLAG_STBC_MASK) *pos |= IEEE80211_RADIOTAP_VHT_FLAG_STBC; + if (status->vht_flag & RX_VHT_FLAG_BF) + *pos |= IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED; pos++; /* bandwidth */ if (status->vht_flag & RX_VHT_FLAG_80MHZ) @@ -1245,6 +1247,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) if (ieee80211_is_data(hdr->frame_control)) { sta->last_rx_rate_idx = status->rate_idx; sta->last_rx_rate_flag = status->flag; + sta->last_rx_rate_vht_flag = status->vht_flag; sta->last_rx_rate_vht_nss = status->vht_nss; } } |