qcacld-2.0: Update NAN HDD APIs as per vendor definitions changes

Remove usage of following attributes from NAN HDD APIs:
1) QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REQUEST
2) QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_RESPONSE
3) QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_IND

Change-Id: I545662de41d4a22a3f1a9f5e037eeaa4050b9d42
CRs-Fixed: 962367

3 files changed, 3 insertions, 44 deletions

diff --git a/CORE/HDD/src/wlan_hdd_nan_datapath.c b/CORE/HDD/src/wlan_hdd_nan_datapath.c
index e41d9c0ae6b4..4075ba4f2766 100644
--- a/CORE/HDD/src/wlan_hdd_nan_datapath.c
+++ b/CORE/HDD/src/wlan_hdd_nan_datapath.c
@@ -731,20 +731,6 @@ static int hdd_ndp_end_req_handler(hdd_context_t *hdd_ctx, struct nlattr **tb)
 }
 
 /**
- * hdd_ndp_schedule_req_handler() - NDP schedule request handler
- * @hdd_ctx: hdd context
- * @tb: parsed NL attribute list
- *
- * Return: 0 on success or error code on failure
- */
-static int hdd_ndp_schedule_req_handler(hdd_context_t *hdd_ctx,
-						struct nlattr **tb)
-{
-	return 0;
-}
-
-
-/**
  * hdd_ndp_iface_create_rsp_handler() - NDP iface create response handler
  * @adapter: pointer to adapter context
  * @rsp_params: response parameters
@@ -1658,19 +1644,6 @@ ndp_end_ind_nla_failed:
 }
 
 /**
- * hdd_ndp_schedule_update_rsp_handler() - NDP schedule update response handler
- * @adapter: pointer to adapter context
- * @rsp_params: response parameters
- *
- * Return: none
- */
-static void hdd_ndp_schedule_update_rsp_handler(
-				hdd_adapter_t *adapter, void *rsp_params)
-{
-	return;
-}
-
-/**
  * hdd_ndp_event_handler() - ndp response and indication handler
  * @adapter: adapter context
  * @roam_info: pointer to roam_info structure
@@ -1710,10 +1683,6 @@ void hdd_ndp_event_handler(hdd_adapter_t *adapter,
 			hdd_ndp_indication_handler(adapter,
 				&roam_info->ndp.ndp_indication_params);
 			break;
-		case eCSR_ROAM_RESULT_NDP_SCHED_UPDATE_RSP:
-			hdd_ndp_schedule_update_rsp_handler(adapter,
-				&roam_info->ndp.ndp_sched_upd_rsp_params);
-			break;
 		case eCSR_ROAM_RESULT_NDP_RESPONDER_RSP:
 			hdd_ndp_responder_rsp_handler(adapter,
 				&roam_info->ndp.ndp_responder_rsp_params);
@@ -1821,9 +1790,6 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 	case QCA_WLAN_VENDOR_ATTR_NDP_END_REQUEST:
 		ret_val = hdd_ndp_end_req_handler(hdd_ctx, tb);
 		break;
-	case QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REQUEST:
-		ret_val = hdd_ndp_schedule_req_handler(hdd_ctx, tb);
-		break;
 	default:
 		hddLog(LOGE, FL("Unrecognized NDP vendor cmd %d"),
 			ndp_cmd_type);
diff --git a/CORE/HDD/src/wlan_hdd_nan_datapath.h b/CORE/HDD/src/wlan_hdd_nan_datapath.h
index cf72826f0599..a19392ab0868 100644
--- a/CORE/HDD/src/wlan_hdd_nan_datapath.h
+++ b/CORE/HDD/src/wlan_hdd_nan_datapath.h
@@ -125,11 +125,8 @@ enum qca_wlan_vendor_attr_ndp_qos {
  * @QCA_WLAN_VENDOR_ATTR_NDP_RESPONDER_RESPONSE: NDP responder response
  * @QCA_WLAN_VENDOR_ATTR_NDP_END_REQUEST: NDP end request
  * @QCA_WLAN_VENDOR_ATTR_NDP_END_RESPONSE: NDP end response
- * @QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REQUEST: NDP update request
- * @QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_RESPONSE: NDP update response
  * @QCA_WLAN_VENDOR_ATTR_NDP_REQUEST_IND: NDP request indication
  * @QCA_WLAN_VENDOR_ATTR_NDP_CONFIRM_IND: NDP confirm indication
- * @QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_IND: NDP sched update indication
  * @QCA_WLAN_VENDOR_ATTR_NDP_END_IND: NDP End indication
  */
 enum qca_wlan_vendor_attr_ndp_sub_cmd_value {
@@ -142,12 +139,9 @@ enum qca_wlan_vendor_attr_ndp_sub_cmd_value {
 	QCA_WLAN_VENDOR_ATTR_NDP_RESPONDER_RESPONSE = 6,
 	QCA_WLAN_VENDOR_ATTR_NDP_END_REQUEST = 7,
 	QCA_WLAN_VENDOR_ATTR_NDP_END_RESPONSE = 8,
-	QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_REQUEST = 9,
-	QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_RESPONSE = 10,
-	QCA_WLAN_VENDOR_ATTR_NDP_REQUEST_IND = 11,
-	QCA_WLAN_VENDOR_ATTR_NDP_CONFIRM_IND = 12,
-	QCA_WLAN_VENDOR_ATTR_NDP_SCHEDULE_UPDATE_IND = 13,
-	QCA_WLAN_VENDOR_ATTR_NDP_END_IND = 14
+	QCA_WLAN_VENDOR_ATTR_NDP_REQUEST_IND = 9,
+	QCA_WLAN_VENDOR_ATTR_NDP_CONFIRM_IND = 10,
+	QCA_WLAN_VENDOR_ATTR_NDP_END_IND = 11
 };
 
 /** enum nan_datapath_state - NAN datapath states
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index 8e16ac07d31a..65f712ebf2ab 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -650,7 +650,6 @@ typedef enum
     eCSR_ROAM_RESULT_NDP_NEW_PEER_IND,
     eCSR_ROAM_RESULT_NDP_CONFIRM_IND,
     eCSR_ROAM_RESULT_NDP_INDICATION,
-    eCSR_ROAM_RESULT_NDP_SCHED_UPDATE_RSP,
     eCSR_ROAM_RESULT_NDP_RESPONDER_RSP,
     eCSR_ROAM_RESULT_NDP_END_RSP,
     eCSR_ROAM_RESULT_NDP_PEER_DEPARTED_IND,