summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>2017-04-27 20:11:49 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-04 23:47:51 -0700
commit93da24c049dac3cec834d3a444487c0a70ca7d0c (patch)
treec982bb06651ecbe00a97f6e9bbed5ae44c2cdad1
parent81c4cc524a75cc7e54a844334db132d4f19b4f5d (diff)
qcacmn: Code refactor of probe req IE whitelist
Optimize the memory allocation for vendor OUIs in probe request IE whitelist feature. Change-Id: I113ff2268a5670ade7b59c79346aff50791ba8f3 CRs-Fixed: 2053025
-rw-r--r--wmi/inc/wmi_unified_param.h10
-rw-r--r--wmi/src/wmi_unified_tlv.c7
2 files changed, 3 insertions, 14 deletions
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index 59726ef9a03c..d0ab5f7b2386 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -969,16 +969,6 @@ struct ap_ps_params {
uint32_t value;
};
-/**
- * struct vendor_oui - probe request ie vendor oui information
- * @oui_type: type of the vendor oui (3 valid octets)
- * @oui_subtype: subtype of the vendor oui (1 valid octet)
- */
-struct vendor_oui {
- uint32_t oui_type;
- uint32_t oui_subtype;
-};
-
#define WMI_HOST_SCAN_CHAN_FREQ_SHIFT 0
#define WMI_HOST_SCAN_CHAN_FREQ_MASK 0xffff
#define WMI_HOST_SCAN_CHAN_MODE_SHIFT 16
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 8305e4f265bc..8c49174b0363 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -1440,18 +1440,17 @@ static void wmi_fill_vendor_oui(uint8_t *buf_ptr, uint32_t num_vendor_oui,
void *param_voui)
{
wmi_vendor_oui *voui = NULL;
- struct vendor_oui *pvoui = NULL;
+ uint32_t *pvoui = NULL;
uint32_t i;
voui = (wmi_vendor_oui *)buf_ptr;
- pvoui = (struct vendor_oui *)param_voui;
+ pvoui = (uint32_t *)param_voui;
for (i = 0; i < num_vendor_oui; i++) {
WMITLV_SET_HDR(&voui[i].tlv_header,
WMITLV_TAG_STRUC_wmi_vendor_oui,
WMITLV_GET_STRUCT_TLVLEN(wmi_vendor_oui));
- voui[i].oui_type_subtype = pvoui[i].oui_type |
- (pvoui[i].oui_subtype << 24);
+ voui[i].oui_type_subtype = pvoui[i];
}
}