From bcbb6500c68d9d534bac845bd6b1fb33564c6359 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 31 Dec 2018 19:37:00 -0800 Subject: [PATCH] qcacld-3.0: Remove gLimProbeRespDisableFlag from tAniSirLim The gLimProbeRespDisableFlag field in tAniSirLim is initialized, but is otherwise never modified, hence it serves no purpose. Therefore remove it. Change-Id: I053ad8f37b8be31d2f6ad261063c26a1e55c951f CRs-Fixed: 2379068 --- core/mac/inc/ani_global.h | 2 -- core/mac/src/pe/lim/lim_api.c | 1 - core/mac/src/pe/lim/lim_process_probe_req_frame.c | 6 +----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 29e717e92b5d..d1de0273463f 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -465,10 +465,8 @@ typedef struct sAniSirLim { /* */ /* ---------------- DPH ----------------------- */ - /* these used to live in DPH but are now moved here (where they belong) */ uint32_t gLimPhyMode; - uint8_t gLimProbeRespDisableFlag:1; /* control over probe response */ /* ---------------- DPH ----------------------- */ /* //////////////////////////////////////// STATES RELATED END /////////////////////////////////////////// */ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 8f07eefdd971..8a14b18cc64a 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -158,7 +158,6 @@ static void __lim_init_states(struct mac_context *mac) sizeof(tLimNoShortSlotParams)); mac->lim.gLimPhyMode = 0; - mac->lim.gLimProbeRespDisableFlag = 0; /* control over probe resp */ } static void __lim_init_vars(struct mac_context *mac) diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 43b84a3a2d57..5bcda008bbe5 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -255,10 +255,6 @@ lim_process_probe_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_info, tSirProbeReq probe_req; tAniSSID ssid; - /* Don't send probe responses if disabled */ - if (mac_ctx->lim.gLimProbeRespDisableFlag) - return; - mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); if (LIM_IS_AP_ROLE(session) || (LIM_IS_IBSS_ROLE(session) &&