Эх сурвалжийг харах

qcacld-3.0: fix compilation failures caused by type mismatch

Fix compilation failures caused by type mismatch
between format and argument.
Fix some kernel-doc errors.

Change-Id: Id55c19eff1dd62102feffac1785b5fe825555fde
CRs-Fixed: 3805434
Yu Wang 1 жил өмнө
parent
commit
0e2028eb61

+ 1 - 1
components/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -7794,7 +7794,7 @@ policy_mgr_is_ml_links_in_mcc_allowed(struct wlan_objmgr_psoc *psoc,
 	if (*num_ml_sta < 2 || *num_ml_sta > MAX_NUMBER_OF_CONC_CONNECTIONS ||
 	    num_disabled_ml_sta) {
 		policy_mgr_debug("num_ml_sta invalid %d or link already disabled%d",
-				 num_ml_sta, num_disabled_ml_sta);
+				 *num_ml_sta, num_disabled_ml_sta);
 		return QDF_STATUS_E_FAILURE;
 	}
 

+ 2 - 2
components/cmn_services/policy_mgr/src/wlan_policy_mgr_ll_sap.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. 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 above
@@ -80,7 +80,7 @@ policy_mgr_check_scc:
 	policy_mgr_check_scc_channel(psoc, new_sap_freq, sap_ch_freq, vdev_id,
 				     cc_switch_mode);
 	policy_mgr_debug("vdev_id %d old_freq %d new_freq %d", vdev_id,
-			 sap_ch_freq, new_sap_freq);
+			 sap_ch_freq, *new_sap_freq);
 }
 
 uint8_t wlan_policy_mgr_get_ll_lt_sap_vdev_id(struct wlan_objmgr_psoc *psoc)

+ 2 - 2
components/coex/dispatcher/src/wlan_coex_ucfg_api.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. 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 above
@@ -157,7 +157,7 @@ ucfg_coex_send_logging_config(struct wlan_objmgr_psoc *psoc,
 	param.config_arg5 = apps_args[5];
 	param.config_arg6 = apps_args[6];
 
-	coex_debug("send logging_config arg: %d for vdev %d", apps_args,
+	coex_debug("send logging_config arg: %u for vdev %d", *apps_args,
 		   param.vdev_id);
 
 	status = wlan_coex_config_send(vdev, &param);

+ 1 - 1
core/hdd/src/wlan_hdd_main.c

@@ -17816,7 +17816,7 @@ static QDF_STATUS hdd_ssr_on_pagefault_cb(struct hdd_context *hdd_ctx)
 
 	if (!hdd_ctx->last_pagefault_ssr_time ||
 	    (curr_time - hdd_ctx->last_pagefault_ssr_time) >= ssr_threshold) {
-		hdd_info("curr_time %lu last_pagefault_ssr_time %lu ssr_frequency %d",
+		hdd_info("curr_time %lu last_pagefault_ssr_time %lu ssr_frequency %lu",
 			 curr_time, hdd_ctx->last_pagefault_ssr_time,
 			 ssr_threshold);
 		hdd_ctx->last_pagefault_ssr_time = curr_time;

+ 1 - 1
core/hdd/src/wlan_hdd_stats.c

@@ -9174,7 +9174,7 @@ int wlan_hdd_get_sap_go_peer_linkspeed(struct wlan_hdd_link_info *link_info,
 	struct hdd_station_info *sta_info, *tmp = NULL;
 
 	value = value + command_len;
-	ret = sscanf(value, "%17s", &macaddr_string);
+	ret = sscanf(value, "%17s", macaddr_string);
 
 	if (ret != 1)
 		return -EINVAL;

+ 70 - 137
core/mac/src/pe/rrm/rrm_api.c

@@ -61,20 +61,13 @@
 /* Max passive scan dwell for wide band rrm scan, in milliseconds */
 #define RRM_SCAN_MAX_DWELL_TIME 110
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_cache_mgmt_tx_power
- **
- * FUNCTION:  Store Tx power for management frames.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
+ * rrm_cache_mgmt_tx_power() - Store Tx power for management frames.
+ * @mac: pointer to mac context
+ * @txPower: TX power
+ * @pe_session: per vdev pe context
  *
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 void
 rrm_cache_mgmt_tx_power(struct mac_context *mac, int8_t txPower,
@@ -88,20 +81,12 @@ rrm_cache_mgmt_tx_power(struct mac_context *mac, int8_t txPower,
 		pe_session->txMgmtPower = txPower;
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_get_mgmt_tx_power
- *
- * FUNCTION:  Get the Tx power for management frames.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
+ * rrm_get_mgmt_tx_power() - Get the Tx power for management frames.
+ * @mac: pointer to mac context
+ * @pe_session: per vdev pe context
  *
- * @param pe_session session entry.
- * @return txPower
+ * Return: TX power
  */
 int8_t rrm_get_mgmt_tx_power(struct mac_context *mac, struct pe_session *pe_session)
 {
@@ -113,21 +98,14 @@ int8_t rrm_get_mgmt_tx_power(struct mac_context *mac, struct pe_session *pe_sess
 	return pe_session->txMgmtPower;
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_send_set_max_tx_power_req
- *
- * FUNCTION:  Send WMA_SET_MAX_TX_POWER_REQ message to change the max tx power.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
+ * rrm_send_set_max_tx_power_req() - Send WMA_SET_MAX_TX_POWER_REQ message
+ * to change the max tx power.
+ * @mac: pointer to mac context
+ * @txPower: TX power to be set
+ * @pe_session: per vdev pe context
  *
- * @param txPower txPower to be set.
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 QDF_STATUS
 rrm_send_set_max_tx_power_req(struct mac_context *mac, int8_t txPower,
@@ -171,21 +149,12 @@ rrm_send_set_max_tx_power_req(struct mac_context *mac, int8_t txPower,
 	return retCode;
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_set_max_tx_power_rsp
- *
- * FUNCTION:  Process WMA_SET_MAX_TX_POWER_RSP message.
- *
- * LOGIC:
+ * rrm_set_max_tx_power_rsp() - Process WMA_SET_MAX_TX_POWER_RSP message
+ * @mac: pointer to mac context
+ * @limMsgQ: pointer to scheduler message
  *
- * ASSUMPTIONS:
- *
- * NOTE:
- *
- * @param txPower txPower to be set.
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 QDF_STATUS rrm_set_max_tx_power_rsp(struct mac_context *mac,
 				    struct scheduler_msg *limMsgQ)
@@ -238,22 +207,15 @@ static void rrm_calculate_and_fill_rcpi(uint8_t *rcpi, int8_t cur_rssi)
 		*rcpi = RCPI_MAX_VALUE;
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_process_link_measurement_request
- *
- * FUNCTION:  Processes the Link measurement request and send the report.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
+ * rrm_process_link_measurement_request() - Processes the Link measurement
+ * request and send the report.
+ * @mac: pointer to mac context
+ * @pRxPacketInfo: pointer to packet info structure
+ * @pLinkReq: pointer to the Link request frame structure.
+ * @pe_session: session entry.
  *
- * NOTE:
- *
- * @param pBd pointer to BD to extract RSSI and SNR
- * @param pLinkReq pointer to the Link request frame structure.
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 QDF_STATUS
 rrm_process_link_measurement_request(struct mac_context *mac,
@@ -366,21 +328,14 @@ rrm_process_link_measurement_request(struct mac_context *mac,
 						 pe_session);
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_process_neighbor_report_response
- *
- * FUNCTION:  Processes the Neighbor Report response from the peer AP.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
+ * rrm_process_neighbor_report_response() - Processes the Neighbor Report
+ * response from the peer AP.
+ * @mac: pointer to mac context
+ * @pNeighborRep: pointer to the Neighbor report frame structure.
+ * @pe_session: session entry.
  *
- * @param pNeighborRep pointer to the Neighbor report frame structure.
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 QDF_STATUS
 rrm_process_neighbor_report_response(struct mac_context *mac,
@@ -494,20 +449,13 @@ rrm_process_neighbor_report_response(struct mac_context *mac,
 
 }
 
-/* -------------------------------------------------------------------- */
 /**
- * rrm_process_neighbor_report_req
- *
- * FUNCTION:
+ * rrm_process_neighbor_report_req() - Create a Neighbor report request
+ * and send it to peer.
+ * @mac: pointer to mac context
+ * @pNeighborReq: Neighbor report request params
  *
- * LOGIC: Create a Neighbor report request and send it to peer.
- *
- * ASSUMPTIONS:
- *
- * NOTE:
- *
- * @param pNeighborReq Neighbor report request params .
- * @return None
+ * Return: None
  */
 QDF_STATUS
 rrm_process_neighbor_report_req(struct mac_context *mac,
@@ -797,7 +745,7 @@ rrm_update_vdev_stats(tpSirMacRadioMeasureReport rrm_report, uint8_t vdev_id)
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	pe_nofl_debug("counter stats count: fragment (tx: %d rx: %d) group tx: %d mac stats count: retry : %d multiple retry: %d frame duplicate %d",
+	pe_nofl_debug("counter stats count: fragment (tx: %d rx: %d) group tx: %llu mac stats count: retry : %d multiple retry: %d frame duplicate %d",
 		      stats->tx.fragment_count, stats->rx.fragment_count,
 		      stats->tx.mcast.num, stats->tx.retry_count,
 		      stats->tx.multiple_retry_count,
@@ -942,7 +890,7 @@ static uint16_t rrm_get_max_meas_duration(struct mac_context *mac,
  * rrm_process_sta_stats_report_req: Process RRM sta stats request
  * @mac: mac context
  * @pCurrentReq: Current RRM request
- * @pStaStatsReq: RRM Measurement Request
+ * @sta_stats_req: RRM Measurement Request
  * @pe_session: pe session
  *
  * Return: rrm status
@@ -1102,6 +1050,7 @@ rrm_check_other_sta_sats_req_in_progress(
 /**
  * rrm_process_sta_stats_req: Process RRM sta stats request
  * @mac: mac context
+ * @peer: peer mac
  * @session_entry: pe session
  * @radiomes_report: measurement report
  * @rrm_req: measurement request
@@ -1178,20 +1127,14 @@ failure:
 }
 
 /**
- * rrm_process_beacon_report_req
- *
- * FUNCTION:  Processes the Beacon report request from the peer AP.
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
+ * rrm_process_beacon_report_req() - Processes the Beacon report request
+ * from the peer AP
+ * @mac: pointer to mac context
+ * @pCurrentReq: pointer to the current Req comtext
+ * @pBeaconReq: pointer to the beacon report request IE from the peer
+ * @pe_session: session entry
  *
- * NOTE:
- *
- * @param pCurrentReq pointer to the current Req comtext.
- * @param pBeaconReq pointer to the beacon report request IE from the peer.
- * @param pe_session session entry.
- * @return None
+ * Return: None
  */
 static tRrmRetStatus
 rrm_process_beacon_report_req(struct mac_context *mac,
@@ -1488,7 +1431,8 @@ rrm_check_ml_ie(uint8_t *ies, uint16_t len, uint8_t *mlie_copy_len)
 		return NULL;
 	}
 
-	mlo_debug("[802.11 BCN_RPT]: ML IE is present ml_ie_total_len:%d", ml_ie_total_len);
+	mlo_debug("[802.11 BCN_RPT]: ML IE is present ml_ie_total_len:%zu",
+		  ml_ie_total_len);
 
 	util_get_mlie_common_info_len(ml_ie, ml_ie_total_len,
 				      &ml_common_info_length);
@@ -1539,13 +1483,17 @@ rrm_copy_ml_ie(uint8_t eid, uint8_t extn_eid, uint8_t *ml_ie,
 /**
  * rrm_fill_beacon_ies() - Fills fixed fields and Ies in bss description to an
  * array of uint8_t.
- * @pIes - pointer to the buffer that should be populated with ies.
- * @pNumIes - returns the num of ies filled in this param.
- * @pIesMaxSize - Max size of the buffer pIes.
- * @eids - pointer to array of eids. If NULL, all ies will be populated.
- * @numEids - number of elements in array eids.
+ * @mac: pointer to mac context
+ * @pIes: pointer to the buffer that should be populated with ies.
+ * @pNumIes: returns the num of ies filled in this param.
+ * @pIesMaxSize: Max size of the buffer pIes.
+ * @eids: pointer to array of eids. If NULL, all ies will be populated.
+ * @numEids: number of elements in array eids.
+ * @eid: EID
+ * @extn_eids: pointer to array of ext eids
+ * @extn_eids_count: count of elements in array extn_eids
  * @start_offset: Offset from where the IEs in the bss_desc should be parsed
- * @bss_desc - pointer to Bss Description.
+ * @bss_desc: pointer to Bss Description.
  *
  * Return: Remaining length of IEs in current bss_desc which are not included
  *	   in pIes.
@@ -2337,7 +2285,7 @@ rrm_process_chan_load_report_xmit(struct mac_context *mac_ctx,
 		     sizeof(channel_load_report->bw_ind));
 	qdf_mem_copy(&channel_load_report->wide_bw, &chan_load_ind->wide_bw,
 		     sizeof(channel_load_report->wide_bw));
-	pe_err("send chan load report for bssId:"QDF_MAC_ADDR_FMT" reg_class:%d, channel:%d, measStartTime:%llu, measDuration:%d, chan_load:%d",
+	pe_err("send chan load report for bssId:" QDF_MAC_ADDR_FMT " reg_class:%d, channel:%d, measStartTime:%lu, measDuration:%d, chan_load:%d",
 	       QDF_MAC_ADDR_REF(sessionBssId.bytes),
 	       channel_load_report->op_class,
 	       channel_load_report->channel,
@@ -2628,18 +2576,11 @@ end:
 }
 
 /**
- * rrm_get_start_tsf
- *
- * FUNCTION:  Get the Start TSF.
+ * rrm_get_start_tsf() - Get the Start TSF.
+ * @mac: pointer to mac context
+ * @pStartTSF: store star TSF in this buffer.
  *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
- *
- * @param startTSF - store star TSF in this buffer.
- * @return txPower
+ * Return: None
  */
 void rrm_get_start_tsf(struct mac_context *mac, uint32_t *pStartTSF)
 {
@@ -2650,19 +2591,12 @@ void rrm_get_start_tsf(struct mac_context *mac, uint32_t *pStartTSF)
 
 /* -------------------------------------------------------------------- */
 /**
- * rrm_get_capabilities
- *
- * FUNCTION:
- * Returns a pointer to tpRRMCaps with all the caps enabled in RRM
- *
- * LOGIC:
- *
- * ASSUMPTIONS:
- *
- * NOTE:
+ * rrm_get_capabilities() - Returns a pointer to tpRRMCaps with all the
+ * caps enabled in RRM
+ * @mac: pointer to mac context
+ * @pe_session: pointer to pe session
  *
- * @param pe_session
- * @return pointer to tRRMCaps
+ * Return: pointer to tRRMCaps
  */
 tpRRMCaps rrm_get_capabilities(struct mac_context *mac, struct pe_session *pe_session)
 {
@@ -2741,9 +2675,8 @@ void rrm_cleanup(struct mac_context *mac, uint8_t idx)
 /**
  * lim_update_rrm_capability() - Update PE context's rrm capability
  * @mac_ctx: Global pointer to MAC context
- * @join_req: Pointer to SME join request.
  *
- * Update PE context's rrm capability based on SME join request.
+ * Update PE context's rrm capability
  *
  * Return: None
  */

+ 12 - 9
core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -759,9 +759,9 @@ out:
 
 /**
  * populate_dot11f_ds_params() - To populate DS IE params
- * mac_ctx: Pointer to global mac context
- * dot11f_param: pointer to DS params IE
- * freq: freq
+ * @mac_ctx: Pointer to global mac context
+ * @dot11f_param: pointer to DS params IE
+ * @freq: freq
  *
  * This routine will populate DS param in management frame like
  * beacon, probe response, and etc.
@@ -2174,10 +2174,10 @@ populate_dot11f_supp_rates(struct mac_context *mac,
 /**
  * populate_dot11f_rates_tdls() - populate supported rates and
  *                                extended supported rates IE.
- * @p_mac global - header.
- * @p_supp_rates - pointer to supported rates IE
- * @p_ext_supp_rates - pointer to extended supported rates IE
- * @curr_oper_channel - current operating channel
+ * @p_mac: Pointer to global mac context
+ * @p_supp_rates: pointer to supported rates IE
+ * @p_ext_supp_rates: pointer to extended supported rates IE
+ * @curr_oper_channel: current operating channel
  *
  * This function populates the supported rates and extended supported
  * rates IE based in the STA capability. If the number of rates
@@ -7135,7 +7135,7 @@ populate_dot11f_chan_load_report(struct mac_context *mac,
 		dot11f->report.channel_load_report.bw_indication.ccfs1 = channel_load_report->bw_ind.center_freq_seg1;
 	}
 
-	pe_debug("regClass %d chan %d meas_time %d meas_dur %d, chan_load %d",
+	pe_debug("regClass %d chan %d meas_time %lu meas_dur %d, chan_load %d",
 		 dot11f->report.channel_load_report.op_class,
 		 dot11f->report.channel_load_report.channel,
 		 channel_load_report->rrm_scan_tsf,
@@ -7509,7 +7509,7 @@ void populate_dot11f_timeout_interval(struct mac_context *mac,
 
 /**
  * populate_dot11f_timing_advert_frame() - Populate the TA mgmt frame fields
- * @mac: the MAC context
+ * @mac_ctx: the MAC context
  * @frame: pointer to the TA frame
  *
  * Return: The SIR status.
@@ -7860,6 +7860,8 @@ populate_dot11f_he_bss_color_change(struct mac_context *mac_ctx,
  * lim_get_ext_ie_ptr_from_ext_id() - Find out ext ie
  * @ie: source ie address
  * @ie_len: source ie length
+ * @oui: oui buffer
+ * @oui_size: oui size
  *
  * This API is used to find out ext ie from ext id
  *
@@ -11426,6 +11428,7 @@ QDF_STATUS populate_dot11f_twt_extended_caps(struct mac_context *mac_ctx,
 /**
  * wlan_fill_single_pmk_ap_cap_from_scan_entry() - WAP3_SPMK VSIE from scan
  * entry
+ * @mac_ctx: pointer to mac_context
  * @bss_desc: BSS Descriptor
  * @scan_entry: scan entry
  *