Pārlūkot izejas kodu

qcacld-3.0: Remove cds_ctx param from register_ocb_peer()

The cdp_peer_ops register_ocb_peer() method currently takes a cds_ctx
parameter. Converged datapath APIs should not require the MCL-specific
CDS context, and in fact it is not required by the MCL implementation,
so remove it from all OCB peer registration APIs.

Change-Id: I873eeb472f463ac76f30de5a9013783565be916d
CRs-Fixed: 2103451
Jeff Johnson 7 gadi atpakaļ
vecāks
revīzija
382bce0268
2 mainītis faili ar 3 papildinājumiem un 9 dzēšanām
  1. 1 7
      core/dp/txrx/ol_txrx.c
  2. 2 2
      core/hdd/src/wlan_hdd_ocb.c

+ 1 - 7
core/dp/txrx/ol_txrx.c

@@ -4936,18 +4936,12 @@ static QDF_STATUS ol_txrx_register_peer(struct ol_txrx_desc_type *sta_desc)
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure
  */
-static QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr,
+static QDF_STATUS ol_txrx_register_ocb_peer(uint8_t *mac_addr,
 				     uint8_t *peer_id)
 {
 	ol_txrx_pdev_handle pdev;
 	ol_txrx_peer_handle peer;
 
-	if (!cds_ctx) {
-		ol_txrx_err("%s: Invalid context",
-			   __func__);
-		return QDF_STATUS_E_FAILURE;
-	}
-
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
 		ol_txrx_err("%s: Unable to find pdev!",

+ 2 - 2
core/hdd/src/wlan_hdd_ocb.c

@@ -239,7 +239,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter)
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
-	qdf_status = cdp_peer_register_ocb_peer(soc, hdd_ctx->pcds_context,
+	qdf_status = cdp_peer_register_ocb_peer(soc,
 				adapter->macAddressCurrent.bytes,
 				&peer_id);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -478,7 +478,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev,
 
 	ENTER_DEV(dev);
 
-	hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
+	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	rc = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != rc)
 		return rc;