Преглед на файлове

qcacmn: Fix issue when getting rnr

When getting rnr IE information, instead of getting rnr pointer through
input parameter,  we can just return rnr pointer.

Change-Id: I57f683eb86bb813018a38fa3a6286e9b6e40037f
CRs-Fixed: 3025194
Bing Sun преди 3 години
родител
ревизия
7fcc2ebd13
променени са 2 файла, в които са добавени 10 реда и са изтрити 12 реда
  1. 3 4
      umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_api.h
  2. 7 8
      umac/mlme/connection_mgr/dispatcher/src/wlan_cm_api.c

+ 3 - 4
umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_api.h

@@ -454,10 +454,9 @@ void wlan_cm_set_candidate_custom_sort_cb(
  * wlan_cm_get_rnr() - get rnr
  * @vdev:vdev
  * @cm_id: connect mgr id
- * @rnr: rnr to get
  *
- * Return: QDF_STATUS
+ * Return: rnr pointer
  */
-QDF_STATUS wlan_cm_get_rnr(struct wlan_objmgr_vdev *vdev, wlan_cm_id cm_id,
-			   struct reduced_neighbor_report *rnr);
+struct reduced_neighbor_report *wlan_cm_get_rnr(struct wlan_objmgr_vdev *vdev,
+						wlan_cm_id cm_id);
 #endif /* __WLAN_CM_UCFG_API_H */

+ 7 - 8
umac/mlme/connection_mgr/dispatcher/src/wlan_cm_api.c

@@ -344,30 +344,29 @@ void wlan_cm_set_candidate_custom_sort_cb(
 
 #endif
 
-QDF_STATUS wlan_cm_get_rnr(struct wlan_objmgr_vdev *vdev, wlan_cm_id cm_id,
-			   struct reduced_neighbor_report *rnr)
+struct reduced_neighbor_report *wlan_cm_get_rnr(struct wlan_objmgr_vdev *vdev,
+						wlan_cm_id cm_id)
 {
 	enum QDF_OPMODE op_mode = wlan_vdev_mlme_get_opmode(vdev);
 	struct cm_req *cm_req;
 	struct cnx_mgr *cm_ctx;
 
-	rnr = NULL;
 	if (op_mode != QDF_STA_MODE && op_mode != QDF_P2P_CLIENT_MODE) {
 		mlme_err("vdev %d Invalid mode %d",
 			 wlan_vdev_get_id(vdev), op_mode);
-		return QDF_STATUS_E_NOSUPPORT;
+		return NULL;
 	}
 
 	cm_ctx = cm_get_cm_ctx(vdev);
 	if (!cm_ctx)
-		return QDF_STATUS_E_FAILURE;
+		return NULL;
 	cm_req = cm_get_req_by_cm_id(cm_ctx, cm_id);
 	if (!cm_req)
-		return QDF_STATUS_E_FAILURE;
+		return NULL;
 
 	if (cm_req->connect_req.cur_candidate &&
 	    cm_req->connect_req.cur_candidate->entry)
-		rnr = &cm_req->connect_req.cur_candidate->entry->rnr;
+		return &cm_req->connect_req.cur_candidate->entry->rnr;
 
-	return QDF_STATUS_SUCCESS;
+	return NULL;
 }