From 2b51190eeb905cd5ea5dd4fb93117d704ed9ad5e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 20 Nov 2018 09:40:23 -0800 Subject: [PATCH] qcacld-3.0: Rename mac in __lim_counter_measures() An upcoming campaign will rename all instances of pMac to mac in the driver. In function __lim_counter_measures() there is already a local variable named mac, so the pMac renaming will cause a conflict. In order to avoid the conflict rename the existing local variable. Change-Id: If7438c9ca98a65c0a3c29b77d279f8bd41258165 CRs-Fixed: 2353461 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 2383a286599f..954041707871 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -2954,11 +2954,11 @@ lim_assoc_sta_end: static void __lim_counter_measures(tpAniSirGlobal pMac, tpPESession psessionEntry) { - tSirMacAddr mac = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + tSirMacAddr mac_addr = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; if (LIM_IS_AP_ROLE(psessionEntry)) lim_send_disassoc_mgmt_frame(pMac, eSIR_MAC_MIC_FAILURE_REASON, - mac, psessionEntry, false); + mac_addr, psessionEntry, false); }; void lim_send_stop_bss_failure_resp(tpAniSirGlobal mac_ctx,