diff options
| author | Karl Beldan <karl.beldan@rivierawaves.com> | 2013-04-15 11:09:30 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-16 10:04:02 -0400 |
| commit | dad6330d034a24a22008ee28b8ec447cbb0961c9 (patch) | |
| tree | 7e3b6f56575504942d4bb9f32e5971dacd36d5ed /drivers/net/wireless/mac80211_hwsim.c | |
| parent | 6bc8312f95f982c0a6f26e87d0a6c299a697ed53 (diff) | |
mac80211_hwsim: handle VHT rates in rx_status
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index b5117f503f83..7ede2407ef8d 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
| @@ -718,9 +718,17 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, | |||
| 718 | rx_status.flag |= RX_FLAG_MACTIME_START; | 718 | rx_status.flag |= RX_FLAG_MACTIME_START; |
| 719 | rx_status.freq = chan->center_freq; | 719 | rx_status.freq = chan->center_freq; |
| 720 | rx_status.band = chan->band; | 720 | rx_status.band = chan->band; |
| 721 | rx_status.rate_idx = info->control.rates[0].idx; | 721 | if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) { |
| 722 | if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS) | 722 | rx_status.rate_idx = |
| 723 | rx_status.flag |= RX_FLAG_HT; | 723 | ieee80211_rate_get_vht_mcs(&info->control.rates[0]); |
| 724 | rx_status.vht_nss = | ||
| 725 | ieee80211_rate_get_vht_nss(&info->control.rates[0]); | ||
| 726 | rx_status.flag |= RX_FLAG_VHT; | ||
| 727 | } else { | ||
| 728 | rx_status.rate_idx = info->control.rates[0].idx; | ||
| 729 | if (info->control.rates[0].flags & IEEE80211_TX_RC_MCS) | ||
| 730 | rx_status.flag |= RX_FLAG_HT; | ||
| 731 | } | ||
| 724 | if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) | 732 | if (info->control.rates[0].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) |
| 725 | rx_status.flag |= RX_FLAG_40MHZ; | 733 | rx_status.flag |= RX_FLAG_40MHZ; |
| 726 | if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI) | 734 | if (info->control.rates[0].flags & IEEE80211_TX_RC_SHORT_GI) |