From 61e8f901b87d5494d684bea901bff8dbb69b2064 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 29 Dec 2018 22:40:45 -0800 Subject: [PATCH] qcacld-3.0: Harmonize lim_set_active_edca_params() The parameter identifiers used in the implementation of lim_set_active_edca_params() differ from the ones used in the prototype. Since this can be confusing for both humans and code analysis tools, harmonize on the parameters used in the implementation. In addition, relocate the documentation so that it is the interface that is documented and not the implementation. Change-Id: Ie352f40ca86a9816d19f6e37b52058e884814202 CRs-Fixed: 2376126 --- core/mac/src/pe/lim/lim_send_messages.c | 20 +------------------- core/mac/src/pe/lim/lim_send_messages.h | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 0f65d536dc..0f26fa84b4 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 @@ -257,24 +257,6 @@ QDF_STATUS lim_send_edca_params(struct mac_context *mac, return retCode; } -/** - * lim_set_active_edca_params() - Choose best EDCA parameters - * - * @mac_ctx: pointer to Global Mac structure. - * @edca_params: pointer to the local EDCA parameters - * @pe_session: point to the session entry - * - * This function is called to set the most up-to-date EDCA parameters - * given the default local EDCA parameters. The rules are as following: - * - If ACM bit is set for all ACs, then downgrade everything to Best Effort. - * - If ACM is not set for any AC, then PE will use the default EDCA - * parameters as advertised by AP. - * - If ACM is set in any of the ACs, PE will use the EDCA parameters - * from the next best AC for which ACM is not enabled. - * - * Return: none - */ - void lim_set_active_edca_params(struct mac_context *mac_ctx, tSirMacEdcaParamRecord *edca_params, struct pe_session *pe_session) diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index 512b35c4ea..96d384f5ca 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-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 @@ -70,9 +70,27 @@ QDF_STATUS lim_set_link_state(struct mac_context *mac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMac, tpSetLinkStateCallback callback, void *callbackArg); -void lim_set_active_edca_params(struct mac_context *mac, - tSirMacEdcaParamRecord *plocalEdcaParams, + +/** + * lim_set_active_edca_params() - Choose best EDCA parameters + * @mac_ctx: pointer to Global Mac structure. + * @edca_params: pointer to the local EDCA parameters + * @pe_session: point to the session entry + * + * This function is called to set the most up-to-date EDCA parameters + * given the default local EDCA parameters. The rules are as following: + * - If ACM bit is set for all ACs, then downgrade everything to Best Effort. + * - If ACM is not set for any AC, then PE will use the default EDCA + * parameters as advertised by AP. + * - If ACM is set in any of the ACs, PE will use the EDCA parameters + * from the next best AC for which ACM is not enabled. + * + * Return: none + */ +void lim_set_active_edca_params(struct mac_context *mac_ctx, + tSirMacEdcaParamRecord *edca_params, struct pe_session *pe_session); + #define CAPABILITY_FILTER_MASK 0x73CF #define ERP_FILTER_MASK 0xF8 #define EDCA_FILTER_MASK 0xF0