samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qcacmn: Initialize mac_phy_count to zero before populating macphy params"

Browse Source
This commit is contained in:
Linux Build Service Account
2017-06-26 17:31:31 -07:00
committed by Gerrit - the friendly Code Review server
parent eba9b1e192 be23decc06
commit 6863f03e13
4 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
os_if/linux/scan/src/wlan_cfg80211_scan.c
View File

@@ -38,6 +38,13 @@
#include <wlan_policy_mgr_api.h> #include <wlan_policy_mgr_api.h>
#endif #endif
static const
struct nla_policy scan_policy[QCA_WLAN_VENDOR_ATTR_SCAN_MAX + 1] = {
[QCA_WLAN_VENDOR_ATTR_SCAN_FLAGS] = {.type = NLA_U32},
[QCA_WLAN_VENDOR_ATTR_SCAN_TX_NO_CCK_RATE] = {.type = NLA_FLAG},
[QCA_WLAN_VENDOR_ATTR_SCAN_COOKIE] = {.type = NLA_U64},
};
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
static uint32_t hdd_config_sched_scan_start_delay( static uint32_t hdd_config_sched_scan_start_delay(
struct cfg80211_sched_scan_request *request) struct cfg80211_sched_scan_request *request)
@@ -1330,7 +1337,7 @@ int wlan_vendor_abort_scan(struct wlan_objmgr_pdev *pdev,
pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev); pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SCAN_MAX, data, if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SCAN_MAX, data,
data_len, NULL)) { data_len, scan_policy)) {
cfg80211_err("Invalid ATTR"); cfg80211_err("Invalid ATTR");
return ret; return ret;
} }

1
target_if/init_deinit/src/service_ready_event_handler.c
View File

@@ -298,6 +298,7 @@ int init_deinit_service_ext_ready_event_handler(ol_scn_t scn_handle,
if (err_code) if (err_code)
goto free_param_and_exit; goto free_param_and_exit;
psoc->total_mac_phy = 0;
err_code = populate_hw_mode_capability(wmi_handle, err_code = populate_hw_mode_capability(wmi_handle,
event, event,
&psoc->total_mac_phy, &psoc->total_mac_phy,

8
wmi/inc/wmi_unified_param.h
View File

@@ -1795,7 +1795,7 @@ struct mobility_domain_info {
#define WMI_HOST_ROAM_OFFLOAD_NUM_MCS_SET (16) #define WMI_HOST_ROAM_OFFLOAD_NUM_MCS_SET (16)
/* This TLV will be filled only in case roam offload /* This TLV will be filled only in case roam offload
* for wpa2-psk/okc/ese/11r is enabled */ * for wpa2-psk/pmkid/ese/11r is enabled */
typedef struct { typedef struct {
/* /*
* TLV tag and len; tag equals * TLV tag and len; tag equals
@@ -1838,7 +1838,8 @@ typedef struct {
* @rokh_id: r0kh id * @rokh_id: r0kh id
* @roam_key_mgmt_offload_enabled: roam offload flag * @roam_key_mgmt_offload_enabled: roam offload flag
* @auth_mode: authentication mode * @auth_mode: authentication mode
* @okc_enabled: enable opportunistic key caching * @fw_okc: use OKC in firmware
* @fw_pmksa_cache: use PMKSA cache in firmware
* @is_ese_assoc: flag to determine ese assoc * @is_ese_assoc: flag to determine ese assoc
* @mdid: mobility domain info * @mdid: mobility domain info
* @roam_offload_params: roam offload tlv params * @roam_offload_params: roam offload tlv params
@@ -1861,7 +1862,8 @@ struct roam_offload_scan_params {
uint8_t rokh_id[WMI_ROAM_R0KH_ID_MAX_LEN]; uint8_t rokh_id[WMI_ROAM_R0KH_ID_MAX_LEN];
uint8_t roam_key_mgmt_offload_enabled; uint8_t roam_key_mgmt_offload_enabled;
int auth_mode; int auth_mode;
bool okc_enabled; bool fw_okc;
bool fw_pmksa_cache;
#endif #endif
bool is_ese_assoc; bool is_ese_assoc;
struct mobility_domain_info mdid; struct mobility_domain_info mdid;

17
wmi/src/wmi_unified_tlv.c
View File

@@ -5437,15 +5437,26 @@ static QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle,
buf_ptr += WMI_TLV_HDR_SIZE; buf_ptr += WMI_TLV_HDR_SIZE;
roam_offload_11i = roam_offload_11i =
(wmi_roam_11i_offload_tlv_param *) buf_ptr; (wmi_roam_11i_offload_tlv_param *) buf_ptr;
if (roam_req->roam_key_mgmt_offload_enabled && if (roam_req->roam_key_mgmt_offload_enabled &&
roam_req->okc_enabled) { roam_req->fw_okc) {
WMI_SET_ROAM_OFFLOAD_OKC_ENABLED WMI_SET_ROAM_OFFLOAD_OKC_ENABLED
(roam_offload_11i->flags); (roam_offload_11i->flags);
WMI_LOGE("LFR3:OKC Enabled"); WMI_LOGE("LFR3:OKC enabled");
} else { } else {
WMI_SET_ROAM_OFFLOAD_OKC_DISABLED WMI_SET_ROAM_OFFLOAD_OKC_DISABLED
(roam_offload_11i->flags); (roam_offload_11i->flags);
WMI_LOGE("LFR3:OKC Disabled"); WMI_LOGE("LFR3:OKC disabled");
}
if (roam_req->roam_key_mgmt_offload_enabled &&
roam_req->fw_pmksa_cache) {
WMI_SET_ROAM_OFFLOAD_PMK_CACHE_ENABLED
(roam_offload_11i->flags);
WMI_LOGE("LFR3:PMKSA caching enabled");
} else {
WMI_SET_ROAM_OFFLOAD_PMK_CACHE_DISABLED
(roam_offload_11i->flags);
WMI_LOGE("LFR3:PMKSA caching disabled");
} }
qdf_mem_copy(roam_offload_11i->pmk, qdf_mem_copy(roam_offload_11i->pmk,