Revert "[wpa_supplicant] Cumulative patch from b8491ae5a"
This reverts commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda.
Reason for revert: git_master/sdk_phone_armv7-sdk
Change-Id: I6070fc5c1f9c20867f6dfce90e529e35578d572e
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index c147649..39cd163 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -452,8 +452,7 @@
break;
case WNM_NEIGHBOR_BSS_TERMINATION_DURATION:
if (elen < 10) {
- wpa_printf(MSG_DEBUG,
- "WNM: Too short BSS termination duration");
+ wpa_printf(MSG_DEBUG, "WNM: Too short bss_term_tsf");
break;
}
rep->bss_term_tsf = WPA_GET_LE64(pos);
@@ -925,9 +924,9 @@
if (ie && ie[1] >= 1) {
vht_oper = (struct ieee80211_vht_operation *) (ie + 2);
- if (vht_oper->vht_op_info_chwidth == CHANWIDTH_80MHZ ||
- vht_oper->vht_op_info_chwidth == CHANWIDTH_160MHZ ||
- vht_oper->vht_op_info_chwidth == CHANWIDTH_80P80MHZ)
+ if (vht_oper->vht_op_info_chwidth == VHT_CHANWIDTH_80MHZ ||
+ vht_oper->vht_op_info_chwidth == VHT_CHANWIDTH_160MHZ ||
+ vht_oper->vht_op_info_chwidth == VHT_CHANWIDTH_80P80MHZ)
vht = vht_oper->vht_op_info_chwidth;
}
@@ -1371,9 +1370,6 @@
const u8 *vendor;
#endif /* CONFIG_MBO */
- if (wpa_s->conf->disable_btm)
- return;
-
if (end - pos < 5)
return;