evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath10k: skip sending default IE in scan request added by firmware"

Browse source
This commit is contained in:
Linux Build Service Account 2017-09-25 20:52:53 -07:00 • committed by Gerrit - the friendly Code Review server
commit d9918fae67
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/wireless/ath/ath10k/mac.c
View file

@ -5479,7 +5479,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
struct cfg80211_scan_request *req = &hw_req->req;
struct wmi_start_scan_arg arg;
int ret = 0;
const u8 *ptr;
int ret = 0, ie_skip_len = 0;
int i;
mutex_lock(&ar->conf_mutex);
@ -5511,8 +5512,16 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,
arg.scan_id = ATH10K_SCAN_ID;
if (req->ie_len) {
arg.ie_len = req->ie_len;
memcpy(arg.ie, req->ie, arg.ie_len);
if (QCA_REV_WCN3990(ar)) {
ptr = req->ie;
while (ptr[0] == WLAN_EID_SUPP_RATES ||
ptr[0] == WLAN_EID_EXT_SUPP_RATES) {
ie_skip_len = ptr[1] + 2;
ptr += ie_skip_len;
}
}
arg.ie_len = req->ie_len - ie_skip_len;
memcpy(arg.ie, req->ie + ie_skip_len, arg.ie_len);
}
if (req->n_ssids) {