Bladeren bron

qcacmn: Fix modpost issue due to mlo_mgr_get_ap_link_by_link_id

This change is to fix modpost issue due to mlo_mgr_get_ap_link_by_link_id
in 6.x compilation.

Change-Id: I2da64fd550f6dbafe87100ca80a280834f1f3f12
CRs-Fixed: 3603454
Nidhi Jain 1 jaar geleden
bovenliggende
commit
0fc63202c0
2 gewijzigde bestanden met toevoegingen van 39 en 32 verwijderingen
  1. 18 11
      umac/mlo_mgr/inc/wlan_mlo_mgr_link_switch.h
  2. 21 21
      umac/mlo_mgr/src/wlan_mlo_mgr_link_switch.c

+ 18 - 11
umac/mlo_mgr/inc/wlan_mlo_mgr_link_switch.h

@@ -243,6 +243,17 @@ void mlo_mgr_update_ap_channel_info(struct wlan_objmgr_vdev *vdev,
 				    uint8_t *ap_link_addr,
 				    struct wlan_channel channel);
 
+/**
+ * mlo_mgr_get_ap_link() - Assoc mlo link info from link id
+ * @vdev: Object Manager vdev
+ *
+ * Get Assoc link info.
+ *
+ * Return: Pointer of link info
+ */
+struct mlo_link_info *mlo_mgr_get_ap_link(struct wlan_objmgr_vdev *vdev);
+
+#ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE
 /**
  * mlo_mgr_get_ap_link_by_link_id() - Get mlo link info from link id
  * @mlo_dev_ctx: mlo context
@@ -258,17 +269,6 @@ struct mlo_link_info*
 mlo_mgr_get_ap_link_by_link_id(struct wlan_mlo_dev_context *mlo_dev_ctx,
 			       int link_id);
 
-/**
- * mlo_mgr_get_ap_link() - Assoc mlo link info from link id
- * @vdev: Object Manager vdev
- *
- * Get Assoc link info.
- *
- * Return: Pointer of link info
- */
-struct mlo_link_info *mlo_mgr_get_ap_link(struct wlan_objmgr_vdev *vdev);
-
-#ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE
 /**
  * mlo_mgr_update_csa_link_info - update mlo sta csa params
  * @mlo_dev_ctx: mlo dev ctx
@@ -621,6 +621,13 @@ mlo_mgr_is_link_switch_supported(struct wlan_objmgr_vdev *vdev)
 }
 
 #else
+static inline struct mlo_link_info
+*mlo_mgr_get_ap_link_by_link_id(struct wlan_mlo_dev_context *mlo_dev_ctx,
+				int link_id)
+{
+	return NULL;
+}
+
 static inline bool
 mlo_mgr_is_link_switch_supported(struct wlan_objmgr_vdev *vdev)
 {

+ 21 - 21
umac/mlo_mgr/src/wlan_mlo_mgr_link_switch.c

@@ -204,27 +204,6 @@ void mlo_mgr_reset_ap_link_info(struct wlan_objmgr_vdev *vdev)
 	}
 }
 
-struct mlo_link_info
-*mlo_mgr_get_ap_link_by_link_id(struct wlan_mlo_dev_context *mlo_dev_ctx,
-				int link_id)
-{
-	struct mlo_link_info *link_info;
-	uint8_t link_info_iter;
-
-	if (!mlo_dev_ctx || link_id < 0 || link_id > 15)
-		return NULL;
-
-	link_info = &mlo_dev_ctx->link_ctx->links_info[0];
-	for (link_info_iter = 0; link_info_iter < WLAN_MAX_ML_BSS_LINKS;
-	     link_info_iter++) {
-		if (link_info->link_id == link_id)
-			return link_info;
-		link_info++;
-	}
-
-	return NULL;
-}
-
 struct mlo_link_info
 *mlo_mgr_get_ap_link(struct wlan_objmgr_vdev *vdev)
 {
@@ -273,6 +252,27 @@ void mlo_mgr_free_link_info_wmi_chan(struct wlan_mlo_dev_context *ml_dev)
 }
 
 #ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE
+struct mlo_link_info
+*mlo_mgr_get_ap_link_by_link_id(struct wlan_mlo_dev_context *mlo_dev_ctx,
+				int link_id)
+{
+	struct mlo_link_info *link_info;
+	uint8_t link_info_iter;
+
+	if (!mlo_dev_ctx || link_id < 0 || link_id > 15)
+		return NULL;
+
+	link_info = &mlo_dev_ctx->link_ctx->links_info[0];
+	for (link_info_iter = 0; link_info_iter < WLAN_MAX_ML_BSS_LINKS;
+	     link_info_iter++) {
+		if (link_info->link_id == link_id)
+			return link_info;
+		link_info++;
+	}
+
+	return NULL;
+}
+
 bool mlo_mgr_update_csa_link_info(struct wlan_mlo_dev_context *mlo_dev_ctx,
 				  struct csa_offload_params *csa_param,
 				  uint8_t link_id)