Pārlūkot izejas kodu

qcacld-3.0: Remove unused cds_ctx param from SME uapsd APIs

Currently sme_enable_uapsd_for_ac() & sme_disable_uapsd_for_ac() take
a cds_ctx parameter. This parameter is no longer used, so remove it.

Change-Id: I36e57975bcfeded648513dce79f32a2fd8f56f5a
CRs-Fixed: 2115518
Jeff Johnson 7 gadi atpakaļ
vecāks
revīzija
a1e92618f2

+ 0 - 1
core/hdd/src/wlan_hdd_tdls.c

@@ -5145,7 +5145,6 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 				hdd_debug("Update TL about UAPSD masks");
 				for (ac = 0; ac < 4; ac++) {
 					status = sme_enable_uapsd_for_ac(
-						 (WLAN_HDD_GET_CTX(pAdapter))->pcds_context,
 						 peer_staid, ucAc[ac],
 						 tlTid[ac], tlTid[ac], 0, 0,
 						 SME_QOS_WMM_TS_DIR_BOTH, 1,

+ 6 - 17
core/hdd/src/wlan_hdd_wmm.c

@@ -165,8 +165,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 	}
 	/* everything is in place to notify TL */
 	status =
-		sme_enable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->pcds_context,
-					   (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->
+		sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->
 					   conn_info.staId[0], acType,
 					   pAc->wmmAcTspecInfo.ts_info.tid,
 					   pAc->wmmAcTspecInfo.ts_info.up,
@@ -208,9 +207,7 @@ static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 	/* have we previously enabled UAPSD? */
 	if (pAc->wmmAcUapsdInfoValid == true) {
 		status =
-			sme_disable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->
-						    pcds_context,
-						    (WLAN_HDD_GET_STATION_CTX_PTR
+			sme_disable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							     (pAdapter))->conn_info.staId[0],
 						    acType, pAdapter->sessionId);
 
@@ -1832,9 +1829,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *pAdapter,
 
 	if (uapsdMask & HDD_AC_VO) {
 		status =
-			sme_enable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->
-						   pcds_context,
-						   (WLAN_HDD_GET_STATION_CTX_PTR
+			sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							    (pAdapter))->conn_info.staId[0],
 						   SME_AC_VO, 7, 7,
 						   hdd_ctx->config->InfraUapsdVoSrvIntv,
@@ -1848,9 +1843,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *pAdapter,
 
 	if (uapsdMask & HDD_AC_VI) {
 		status =
-			sme_enable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->
-						   pcds_context,
-						   (WLAN_HDD_GET_STATION_CTX_PTR
+			sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							    (pAdapter))->conn_info.staId[0],
 						   SME_AC_VI, 5, 5,
 						   hdd_ctx->config->InfraUapsdViSrvIntv,
@@ -1864,9 +1857,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *pAdapter,
 
 	if (uapsdMask & HDD_AC_BK) {
 		status =
-			sme_enable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->
-						   pcds_context,
-						   (WLAN_HDD_GET_STATION_CTX_PTR
+			sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							    (pAdapter))->conn_info.staId[0],
 						   SME_AC_BK, 2, 2,
 						   hdd_ctx->config->InfraUapsdBkSrvIntv,
@@ -1880,9 +1871,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *pAdapter,
 
 	if (uapsdMask & HDD_AC_BE) {
 		status =
-			sme_enable_uapsd_for_ac((WLAN_HDD_GET_CTX(pAdapter))->
-						   pcds_context,
-						   (WLAN_HDD_GET_STATION_CTX_PTR
+			sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							    (pAdapter))->conn_info.staId[0],
 						   SME_AC_BE, 3, 3,
 						   hdd_ctx->config->InfraUapsdBeSrvIntv,

+ 25 - 2
core/sme/inc/sme_api.h

@@ -969,7 +969,22 @@ QDF_STATUS sme_wifi_start_logger(tHalHandle hal,
 bool sme_neighbor_middle_of_roaming(tHalHandle hHal,
 						uint8_t sessionId);
 
-QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
+/**
+ * sme_enable_uapsd_for_ac() - enable uapsd for access catagory request to WMA
+ * @sta_id: station id
+ * @ac: access catagory
+ * @tid: tid value
+ * @pri: user priority
+ * @srvc_int: service interval
+ * @sus_int: suspend interval
+ * @dir: tspec direction
+ * @psb: PSB value
+ * @sessionId: session id
+ * @delay_interval: delay interval
+ *
+ * Return: QDF status
+ */
+QDF_STATUS sme_enable_uapsd_for_ac(uint8_t sta_id,
 				      sme_ac_enum_type ac, uint8_t tid,
 				      uint8_t pri, uint32_t srvc_int,
 				      uint32_t sus_int,
@@ -977,7 +992,15 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 				      uint8_t psb, uint32_t sessionId,
 				      uint32_t delay_interval);
 
-QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
+/**
+ * sme_disable_uapsd_for_ac() - disable uapsd access catagory request to WMA
+ * @sta_id: station id
+ * @ac: access catagory
+ * @sessionId: session id
+ *
+ * Return: QDF status
+ */
+QDF_STATUS sme_disable_uapsd_for_ac(uint8_t sta_id,
 				       sme_ac_enum_type ac,
 				       uint32_t sessionId);
 

+ 2 - 27
core/sme/src/common/sme_api.c

@@ -13804,23 +13804,7 @@ QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac)
 	return status;
 }
 
-/**
- * sme_enable_uapsd_for_ac() - enable uapsd for access catagory requerst to WMA
- * @cds_ctx: cds context
- * @sta_id: station id
- * @ac: access catagory
- * @tid: tid value
- * @pri: user priority
- * @srvc_int: service interval
- * @sus_int: suspend interval
- * @dir: tspec direction
- * @psb: PSB value
- * @sessionId: session id
- * @delay_interval: delay interval
- *
- * Return: QDF status
- */
-QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
+QDF_STATUS sme_enable_uapsd_for_ac(uint8_t sta_id,
 				   sme_ac_enum_type ac, uint8_t tid,
 				   uint8_t pri, uint32_t srvc_int,
 				   uint32_t sus_int,
@@ -13878,16 +13862,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 	return QDF_STATUS_SUCCESS;
 }
 
-/**
- * sme_disable_uapsd_for_ac() - disable uapsed access catagory request to WMA
- * @cds_ctx: cds context
- * @sta_id: station id
- * @ac: access catagory
- * @sessionId: session id
- *
- * Return: QDF status
- */
-QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
+QDF_STATUS sme_disable_uapsd_for_ac(uint8_t sta_id,
 				       sme_ac_enum_type ac,
 				       uint32_t sessionId)
 {