From d8455813dfaf0fa22bfc103e553a7b5adeb44fb1 Mon Sep 17 00:00:00 2001
From: Varun Reddy Yeturu <vyeturu@qca.qualcomm.com>
Date: Sat, 16 Jan 2016 19:05:06 -0800
Subject: [PATCH] qcacld-3.0: Allow Roaming Abort command to firmware

qcacld-2.0 to qcacld-3.0 propagation

Add the roaming abort command to the allowed commands
list and pass on the request to the firmware

CRs-Fixed: 943717
Change-Id: I711d3bd8629813af71e4db8659a1915ccfeaaa72
---
 core/sme/src/csr/csr_api_roam.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 608f4da49825..115e779aa01b 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -16900,24 +16900,29 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer,
  *||==========================================================================||
  *|| New cmd        |            LAST SENT COMMAND --->                       ||
  *||====|=====================================================================||
- *||    V           |  RSO_START  |  RSO_STOP  |  RSO_RESTART | RSO_UPDATE_CFG||
+ *||    V           | START | STOP | RESTART | UPDATE_CFG| ABORT_SCAN         ||
  *|| -------------------------------------------------------------------------||
- *|| RSO_START      |     NO      |   YES      |     NO       |      NO       ||
- *|| RSO_STOP       |    YES      |   YES      |     YES      |      YES      ||
- *|| RSO_RESTART    |    YES      |   NO       |     NO       |      YES      ||
- *|| RSO_UPDATE_CFG |    YES      |   NO       |     YES      |      YES      ||
+ *|| RSO_START      | NO    | YES  |  NO     | NO        | NO                 ||
+ *|| RSO_STOP       | YES   | YES  |  YES    | YES       | YES                ||
+ *|| RSO_RESTART    | YES   | YES  |  NO     | YES       | YES                ||
+ *|| RSO_UPDATE_CFG | YES   | NO   |  YES    | YES       | YES                ||
+ *|| RSO_ABORT_SCAN | YES   | NO   |  YES    | YES       | YES                ||
  *||==========================================================================||
  **/
 #define RSO_START_BIT       (1<<ROAM_SCAN_OFFLOAD_START)
 #define RSO_STOP_BIT        (1<<ROAM_SCAN_OFFLOAD_STOP)
 #define RSO_RESTART_BIT     (1<<ROAM_SCAN_OFFLOAD_RESTART)
 #define RSO_UPDATE_CFG_BIT  (1<<ROAM_SCAN_OFFLOAD_UPDATE_CFG)
+#define RSO_ABORT_SCAN_BIT  (1<<ROAM_SCAN_OFFLOAD_ABORT_SCAN)
 #define RSO_START_ALLOW_MASK   (RSO_STOP_BIT)
 #define RSO_STOP_ALLOW_MASK    (RSO_UPDATE_CFG_BIT | RSO_RESTART_BIT | \
-		RSO_STOP_BIT | RSO_START_BIT)
-#define RSO_RESTART_ALLOW_MASK (RSO_UPDATE_CFG_BIT | RSO_START_BIT)
+		RSO_STOP_BIT | RSO_START_BIT | RSO_ABORT_SCAN_BIT)
+#define RSO_RESTART_ALLOW_MASK (RSO_UPDATE_CFG_BIT | RSO_START_BIT | \
+		RSO_ABORT_SCAN_BIT | RSO_RESTART_BIT)
 #define RSO_UPDATE_CFG_ALLOW_MASK  (RSO_UPDATE_CFG_BIT | RSO_STOP_BIT | \
-		RSO_START_BIT)
+		RSO_START_BIT | RSO_ABORT_SCAN_BIT)
+#define RSO_ABORT_SCAN_ALLOW_MASK (RSO_START_BIT | RSO_RESTART_BIT | \
+		RSO_UPDATE_CFG_BIT | RSO_ABORT_SCAN_BIT)
 
 bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command,
 		uint8_t session_id)
@@ -16940,6 +16945,9 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command,
 	case ROAM_SCAN_OFFLOAD_UPDATE_CFG:
 		desiredMask = RSO_UPDATE_CFG_ALLOW_MASK;
 		break;
+	case ROAM_SCAN_OFFLOAD_ABORT_SCAN:
+		desiredMask = RSO_ABORT_SCAN_ALLOW_MASK;
+		break;
 	default:
 		CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
 			FL("Wrong RSO command %d, not allowed"), command);