Jelajahi Sumber

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

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

Change-Id: I04d42dbeff6613b7c24bbf7e9316f986499a2f56
CRs-Fixed: 1111447
Rajeev Kumar 8 tahun lalu
induk
melakukan
7842768ed6

+ 9 - 8
core/hdd/src/wlan_hdd_assoc.c

@@ -1181,6 +1181,7 @@ hdd_send_update_beacon_ies_event(hdd_adapter_t *pAdapter,
 static void hdd_send_association_event(struct net_device *dev,
 				       tCsrRoamInfo *pCsrRoamInfo)
 {
+	int ret;
 	hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -1275,10 +1276,10 @@ static void hdd_send_association_event(struct net_device *dev,
 		chan_info.reg_info_2 =
 			pCsrRoamInfo->chan_info.reg_info_2;
 
-		qdf_status = hdd_add_peer_object(pAdapter->hdd_vdev,
-						pAdapter->device_mode,
-						peerMacAddr.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_add_peer_object(pAdapter->hdd_vdev,
+					  pAdapter->device_mode,
+					  peerMacAddr.bytes);
+		if (ret)
 			hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
 					MAC_ADDR_ARRAY(peerMacAddr.bytes));
 
@@ -1315,10 +1316,10 @@ static void hdd_send_association_event(struct net_device *dev,
 		hdd_err("wlan: new IBSS connection to " MAC_ADDRESS_STR,
 			 MAC_ADDR_ARRAY(pHddStaCtx->conn_info.bssId.bytes));
 
-		qdf_status = hdd_add_peer_object(pAdapter->hdd_vdev,
-						QDF_IBSS_MODE,
-						pCsrRoamInfo->bssid.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_add_peer_object(pAdapter->hdd_vdev,
+					  QDF_IBSS_MODE,
+					  pCsrRoamInfo->bssid.bytes);
+		if (ret)
 			hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
 				MAC_ADDR_ARRAY(pCsrRoamInfo->bssid.bytes));
 	} else {                /* Not Associated */

+ 6 - 6
core/hdd/src/wlan_hdd_hostapd.c

@@ -1681,12 +1681,12 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 					pHostapdAdapter->device_mode);
 		}
 
-		qdf_status = hdd_add_peer_object(pHostapdAdapter->hdd_vdev,
-					pHostapdAdapter->device_mode,
-					pSapEvent->sapevt.
-					sapStationAssocReassocCompleteEvent.
-					staMac.bytes);
-		if (QDF_IS_STATUS_ERROR(qdf_status))
+		ret = hdd_add_peer_object(pHostapdAdapter->hdd_vdev,
+					  pHostapdAdapter->device_mode,
+					  pSapEvent->sapevt.
+					  sapStationAssocReassocCompleteEvent.
+					  staMac.bytes);
+		if (ret)
 			hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
 					MAC_ADDR_ARRAY(pSapEvent->sapevt.
 					sapStationAssocReassocCompleteEvent.

+ 7 - 7
core/hdd/src/wlan_hdd_object_manager.c

@@ -147,9 +147,9 @@ int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter)
 	return qdf_status_to_os_return(wlan_objmgr_vdev_obj_delete(vdev));
 }
 
-QDF_STATUS hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
-					enum tQDF_ADAPTER_MODE adapter_mode,
-					uint8_t *mac_addr)
+int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
+			enum tQDF_ADAPTER_MODE adapter_mode,
+			uint8_t *mac_addr)
 {
 	enum wlan_peer_type peer_type;
 
@@ -163,22 +163,22 @@ QDF_STATUS hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
 		peer_type = WLAN_PEER_IBSS;
 	} else {
 		hdd_err("Unsupported device mode %d", adapter_mode);
-		return QDF_STATUS_E_FAILURE;
+		return -EINVAL;
 	}
 
 	if (!vdev) {
 		hdd_err("vdev NULL");
 		QDF_ASSERT(0);
-		return QDF_STATUS_E_FAILURE;
+		return -EFAULT;
 	}
 
 	if (!wlan_objmgr_peer_obj_create(vdev, peer_type, mac_addr))
-		return QDF_STATUS_E_FAILURE;
+		return -ENOMEM;
 
 	hdd_info("Peer object "MAC_ADDRESS_STR" add success!",
 					MAC_ADDR_ARRAY(mac_addr));
 
-	return QDF_STATUS_SUCCESS;
+	return 0;
 }
 
 QDF_STATUS hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,

+ 4 - 4
core/hdd/src/wlan_hdd_object_manager.h

@@ -140,11 +140,11 @@ int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter);
  * (STA, AP or IBSS) is assigned based on adapter mode. For example, if adapter
  * mode is STA, peer is AP.
  *
- * Return: QDF_STATUS
+ * Return: 0 for success, negative error code for failure
  */
-QDF_STATUS hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
-				enum tQDF_ADAPTER_MODE adapter_mode,
-				uint8_t *mac_addr);
+int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
+			enum tQDF_ADAPTER_MODE adapter_mode,
+			uint8_t *mac_addr);
 
 /**
  * hdd_remove_peer_object() - Delete and remove the peer from vdev