UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: mvm: properly decode HE GI duration 

The GI duration depends on the frame type in some cases,
take that into account when decoding for radiotap.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Johannes Berg 2018-05-02 22:53:34 +02:00 committed by Luca Coelho
parent de8da23060
commit 93cc712a79
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
View File

@ -1150,25 +1150,35 @@ static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,
switch ((rate_n_flags & RATE_MCS_HE_GI_LTF_MSK) >> switch ((rate_n_flags & RATE_MCS_HE_GI_LTF_MSK) >>
RATE_MCS_HE_GI_LTF_POS) { RATE_MCS_HE_GI_LTF_POS) {
case 0: case 0:
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8; if (he_type == RATE_MCS_HE_TYPE_TRIG)
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
else
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
if (he_type == RATE_MCS_HE_TYPE_MU) if (he_type == RATE_MCS_HE_TYPE_MU)
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X; ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
else else
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X; ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_1X;
break; break;
case 1: case 1:
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8; if (he_type == RATE_MCS_HE_TYPE_TRIG)
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
else
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X; ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
break; break;
case 2: case 2:
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6; if (he_type == RATE_MCS_HE_TYPE_TRIG) {
if (he_type == RATE_MCS_HE_TYPE_TRIG) rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2;
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X; ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_4X;
else } else {
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_1_6;
ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X; ltf = IEEE80211_RADIOTAP_HE_DATA5_LTF_SIZE_2X;
}
break; break;
case 3: case 3:
if (rate_n_flags & RATE_MCS_SGI_MSK) if ((he_type == RATE_MCS_HE_TYPE_SU ||
he_type == RATE_MCS_HE_TYPE_EXT_SU) &&
rate_n_flags & RATE_MCS_SGI_MSK)
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8; rx_status->he_gi = NL80211_RATE_INFO_HE_GI_0_8;
else else
rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2; rx_status->he_gi = NL80211_RATE_INFO_HE_GI_3_2;