qcacld-3.0: Modify HDD peer delete API to return OS status

HDD APIs should return native OS return code hence modify
hdd_remove_peer_object() to return native OS return code

Change-Id: Ib337be420308445017e641a545eaae6c565a8aa2
CRs-Fixed: 1111451

core/hdd/src/wlan_hdd_assoc.c

@@ -1189,7 +1189,6 @@ static void hdd_send_association_event(struct net_device *dev,
 	int we_event;
 	char *msg;
 	struct qdf_mac_addr peerMacAddr;
-	QDF_STATUS qdf_status;
 
 	/* Added to find the auth type on the fly at run time */
 	/* rather than with cfg to see if FT is enabled */
@@ -1345,9 +1344,9 @@ static void hdd_send_association_event(struct net_device *dev,
 							pAdapter->device_mode);
 		}
 
-		qdf_status = hdd_remove_peer_object(pAdapter->hdd_vdev,
-							peerMacAddr.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_remove_peer_object(pAdapter->hdd_vdev,
+					     peerMacAddr.bytes);
+		if (ret)
 			hdd_err("Peer obj "MAC_ADDRESS_STR" delete fails",
 					MAC_ADDR_ARRAY(peerMacAddr.bytes));
 
@@ -3305,8 +3304,9 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter,
 					eRoamCmdStatus roamStatus,
 					eCsrRoamResult roamResult)
 {
-	QDF_STATUS qdf_status;
+	int ret;
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+	QDF_STATUS qdf_status;
 
 	switch (roamResult) {
 	case eCSR_ROAM_RESULT_IBSS_NEW_PEER:
@@ -3419,9 +3419,9 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter,
 		pHddCtx->sta_to_adapter[pRoamInfo->staId] = NULL;
 		pHddStaCtx->ibss_sta_generation++;
 
-		qdf_status = hdd_remove_peer_object(pAdapter->hdd_vdev,
-					pRoamInfo->peerMac.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_remove_peer_object(pAdapter->hdd_vdev,
+					     pRoamInfo->peerMac.bytes);
+		if (ret)
 			hdd_err("Peer obj "MAC_ADDRESS_STR" delete fails",
 				MAC_ADDR_ARRAY(pRoamInfo->peerMac.bytes));
 

core/hdd/src/wlan_hdd_hostapd.c

@@ -1804,11 +1804,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						NULL,
 						pHostapdAdapter->device_mode);
 		}
-		qdf_status = hdd_remove_peer_object(pHostapdAdapter->hdd_vdev,
-					pSapEvent->sapevt.
-					sapStationDisassocCompleteEvent.
-					staMac.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_remove_peer_object(pHostapdAdapter->hdd_vdev,
+					     pSapEvent->sapevt.
+					     sapStationDisassocCompleteEvent.
+					     staMac.bytes);
+		if (ret)
 			hdd_err("Peer obj "MAC_ADDRESS_STR" delete fails",
 					MAC_ADDR_ARRAY(pSapEvent->sapevt.
 					sapStationDisassocCompleteEvent.

core/hdd/src/wlan_hdd_object_manager.c

@@ -181,8 +181,8 @@ int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
 	return 0;
 }
 
-QDF_STATUS hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
-						uint8_t *mac_addr)
+int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
+			   uint8_t *mac_addr)
 {
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_objmgr_peer *peer;
@@ -190,28 +190,28 @@ QDF_STATUS hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
 	if (!vdev) {
 		hdd_err("vdev NULL");
 		QDF_ASSERT(0);
-		return QDF_STATUS_E_FAILURE;
+		return -EINVAL;
 	}
 
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		hdd_err("Psoc NUll");
 		QDF_ASSERT(0);
-		return QDF_STATUS_E_FAILURE;
+		return -EINVAL;
 	}
 
 	peer = wlan_objmgr_find_peer(psoc, mac_addr);
 	if (peer) {
-		if (wlan_objmgr_peer_obj_delete(peer))
-			return QDF_STATUS_E_FAILURE;
+		if (QDF_IS_STATUS_ERROR(wlan_objmgr_peer_obj_delete(peer)))
+			return -EFAULT;
 
 		hdd_info("Peer obj "MAC_ADDRESS_STR" deleted",
 				MAC_ADDR_ARRAY(mac_addr));
-		return QDF_STATUS_SUCCESS;
+		return 0;
 	}
 
 	hdd_err("Peer obj "MAC_ADDRESS_STR" not found",
 				MAC_ADDR_ARRAY(mac_addr));
 
-	return QDF_STATUS_E_FAILURE;
+	return -EINVAL;
 }

core/hdd/src/wlan_hdd_object_manager.h

@@ -153,8 +153,8 @@ int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
  *
  * This API finds the peer object from given @mac_addr and deletes the same.
  *
- * Return: QDF_STATUS
+ * Return: 0 for success, negative error code for failure
  */
-QDF_STATUS hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
-						uint8_t *mac_addr);
+int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
+			   uint8_t *mac_addr);
 #endif /* end #if !defined(WLAN_HDD_OBJECT_MANAGER_H) */