ソースを参照

qcacld-3.0: Use array size for checking valid link idx

Use array size of link info for checking valid link idx

Change-Id: I197fbc011bd71e6a56b607726a8029c4247e6926
CRs-Fixed: 3554841
Vinod Kumar Pirla 1 年間 前
コミット
780f32137a
1 ファイル変更6 行追加3 行削除
  1. 6 3
      core/hdd/inc/wlan_hdd_main.h

+ 6 - 3
core/hdd/inc/wlan_hdd_main.h

@@ -2679,6 +2679,7 @@ hdd_adapter_get_next_active_link_info(struct hdd_adapter *adapter,
 				      struct wlan_hdd_link_info **link_info)
 {
 	uint8_t link_idx = WLAN_HDD_DEFLINK_IDX;
+	uint8_t link_idx_max;
 
 	if (!link_info || !adapter)
 		return;
@@ -2693,7 +2694,8 @@ hdd_adapter_get_next_active_link_info(struct hdd_adapter *adapter,
 		link_idx = hdd_adapter_get_index_of_link_info(*link_info) + 1;
 
 	*link_info = NULL;
-	while (link_idx < WLAN_MAX_MLD && !(*link_info)) {
+	link_idx_max = QDF_ARRAY_SIZE(adapter->link_info);
+	while (link_idx < link_idx_max && !(*link_info)) {
 		*link_info = hdd_adapter_get_link_info_if_active(adapter,
 								 link_idx);
 		link_idx++;
@@ -2724,7 +2726,8 @@ hdd_adapter_get_next_active_link_info(struct hdd_adapter *adapter,
 		(__link_info = adapter ? &((adapter)->link_info[0]) : NULL)
 
 #define __hdd_is_link_info_idx_valid(adapter, __link_info) \
-		((__link_info - &(adapter)->link_info[0]) < WLAN_MAX_MLD)
+	((__link_info - &(adapter)->link_info[0]) < \
+					QDF_ARRAY_SIZE((adapter)->link_info))
 
 #define __hdd_adapter_next_link_info(link_info)	((link_info)++)
 
@@ -3363,7 +3366,7 @@ static inline bool hdd_dynamic_mac_addr_supported(struct hdd_context *hdd_ctx)
 static inline struct wlan_hdd_link_info *
 hdd_adapter_get_link_info_ptr(struct hdd_adapter *adapter, uint8_t link_idx)
 {
-	if (!adapter || (link_idx >= WLAN_MAX_MLD))
+	if (!adapter || (link_idx >= QDF_ARRAY_SIZE(adapter->link_info)))
 		return NULL;
 
 	return &adapter->link_info[link_idx];