qcacld-3.0: Fix SAP ACS logging
Fix misleading ACS logging that indicates best channel and final
channel selected are different.
Change-Id: I00a2a15fa9d709c3e78ebf580d599ec10deefb28
CRs-Fixed: 2105204
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 3d07051..e9ca551 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -612,7 +612,7 @@
policy_mgr_disallow_mcc(mac_ctx->psoc, best_chnl))) {
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_INFO_HIGH,
- "Best channel is: %d",
+ "Best channel so far is: %d",
best_chnl);
return best_chnl;
}
@@ -2422,33 +2422,19 @@
}
-/*==========================================================================
- FUNCTION sap_filter_over_lap_ch
-
- DESCRIPTION
- return true if ch is acceptable.
- This function will decide if we will filter over lap channel or not.
-
- DEPENDENCIES
- shall called after ap start.
-
- PARAMETERS
-
- IN
- pSapCtx : Pointer to ptSapContext.
- chNum : Filter channel number.
-
- RETURN VALUE
- bool : true if channel is accepted.
-
- SIDE EFFECTS
- ============================================================================*/
-static bool sap_filter_over_lap_ch(ptSapContext pSapCtx, uint16_t chNum)
+/**
+ * sap_is_ch_non_overlap() - returns true if non-overlapping channel
+ * @sap_ctx: Sap context
+ * @ch: channel number
+ *
+ * Returns: true if non-overlapping (1, 6, 11) channel, false otherwise
+ */
+static bool sap_is_ch_non_overlap(ptSapContext sap_ctx, uint16_t ch)
{
- if (pSapCtx->enableOverLapCh)
+ if (sap_ctx->enableOverLapCh)
return true;
- else if ((chNum == CHANNEL_1) ||
- (chNum == CHANNEL_6) || (chNum == CHANNEL_11))
+
+ if ((ch == CHANNEL_1) || (ch == CHANNEL_6) || (ch == CHANNEL_11))
return true;
return false;
@@ -2675,11 +2661,12 @@
}
/* Give preference to Non-overlap channels */
- if (false == sap_filter_over_lap_ch(sap_ctx,
+ if (false == sap_is_ch_non_overlap(sap_ctx,
spect_info->pSpectCh[count].chNum)) {
QDF_TRACE(QDF_MODULE_ID_SAP,
QDF_TRACE_LEVEL_INFO_HIGH,
- "sap_filter_over_lap_ch is false");
+ FL("ch: %d skipped as its overlapping ch"),
+ spect_info->pSpectCh[count].chNum);
continue;
}