commit b08959a747330dc0cd4206e6dc43b7003c28ffe6
author Dhanashri Atre <datre@codeaurora.org> Tue Mar 01 17:28:03 2016 -0800
committer Dhanashri Atre <datre@codeaurora.org> Fri Apr 01 16:09:57 2016 -0700
tree 88a4be17d4066cdde095dc54f74db96e961a5bbb
parent 168d2b492e27345f0e40f0aaf6f453a5e0057c8b

qcacld-4.0: Data path changes to use converged APIs (Part 4)

Changes in the data path to use the converged MCL specific APIs.

Change-Id: Ib6ae1917a9678dcd735b81e3aa83d086406ac404
CRs-Fixed: 994638

core/hdd/src/wlan_hdd_softap_tx_rx.c

diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index fb4739f..d73f07e 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -39,6 +39,7 @@
 #include <cds_sched.h>
 #include <wlan_hdd_napi.h>
 #include <ol_txrx.h>
+#include <cdp_txrx_peer_ops.h>
 
 #ifdef IPA_OFFLOAD
 #include <wlan_hdd_ipa.h>
@@ -241,15 +242,15 @@
 			goto drop_pkt;
 		}
 
-		if ((ol_txrx_peer_state_conn !=
+		if ((OL_TXRX_PEER_STATE_CONN !=
 		     pAdapter->aStaInfo[STAId].tlSTAState)
-		    && (ol_txrx_peer_state_auth !=
+		    && (OL_TXRX_PEER_STATE_AUTH !=
 			pAdapter->aStaInfo[STAId].tlSTAState)) {
 			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
 				  QDF_TRACE_LEVEL_WARN,
 				  "%s: Station not connected yet", __func__);
 			goto drop_pkt;
-		} else if (ol_txrx_peer_state_conn ==
+		} else if (OL_TXRX_PEER_STATE_CONN ==
 			   pAdapter->aStaInfo[STAId].tlSTAState) {
 			if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) {
 				QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
@@ -739,9 +740,9 @@
 		 * transition TL directly to 'Authenticated' state.
 		 */
 		qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id,
-						ol_txrx_peer_state_auth, false);
+						OL_TXRX_PEER_STATE_AUTH, false);
 
-		pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_auth;
+		pAdapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_AUTH;
 		pAdapter->sessionCtx.ap.uIsAuthenticated = true;
 	} else {
 
@@ -750,8 +751,8 @@
 			  pAdapter->aStaInfo[staId].ucSTAId);
 
 		qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id,
-						ol_txrx_peer_state_conn, false);
-		pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_conn;
+						OL_TXRX_PEER_STATE_CONN, false);
+		pAdapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_CONN;
 
 		pAdapter->sessionCtx.ap.uIsAuthenticated = false;
 
@@ -899,7 +900,7 @@
 
 	if (QDF_STATUS_SUCCESS == qdf_status) {
 		pAdapter->aStaInfo[ucSTAId].tlSTAState =
-			ol_txrx_peer_state_auth;
+			OL_TXRX_PEER_STATE_AUTH;
 	}
 
 	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,