samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix MLO compilations when kernel doesn't support MLO

Browse Source 
Along with 11BE_MLO feature macro, check for Kernel 11be macro as well
to avoid compilation issues when kernel doesn't support MLO.

Change-Id: Ie6b513cdb9846b1c47674cabbd8e5ff1a1adff63
CRs-Fixed: 3087573
This commit is contained in:
Bapiraju Alla
2021-12-03 15:32:11 +05:30
committed by Madan Koyyalamudi
parent 03ba46bd2e
commit b93d2939d0
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/hdd/inc/wlan_hdd_main.h
View File

@@ -1569,7 +1569,7 @@ struct hdd_adapter {
#ifdef WLAN_FEATURE_PKT_CAPTURE
struct hdd_adapter *mon_adapter;
#endif
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
struct hdd_mlo_adapter_info mlo_adapter_info;
#endif
};
@@ -2302,7 +2302,7 @@ struct hdd_context {
bool dump_in_progress;
uint64_t bw_vote_time;
struct hdd_dual_sta_policy dual_sta_policy;
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
struct hdd_mld_mac_info mld_mac_info;
#endif
#ifdef THERMAL_STATS_SUPPORT

5
core/hdd/inc/wlan_hdd_mlo.h
View File

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -38,7 +39,7 @@ struct hdd_adapter_create_param {
unused:29;
};
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
#define hdd_adapter_is_link_adapter(x) ((x)->mlo_adapter_info.is_link_adapter)
#define hdd_adapter_is_ml_adapter(x) ((x)->mlo_adapter_info.is_ml_adapter)
#else
@@ -46,7 +47,7 @@ struct hdd_adapter_create_param {
#define hdd_adapter_is_ml_adapter(x) (0)
#endif
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
/**
* struct hdd_mld_mac - hdd structure to hold mld address
* @mld_mac: mld addr

8
core/hdd/src/wlan_hdd_main.c
View File

@@ -5219,7 +5219,7 @@ void hdd_update_dynamic_mac(struct hdd_context *hdd_ctx,
hdd_exit();
}
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
static void
hdd_set_mld_address(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
struct qdf_mac_addr *mac_addr)
@@ -6269,7 +6269,7 @@ bool hdd_is_vdev_in_conn_state(struct hdd_adapter *adapter)
return 0;
}
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
static void
hdd_populate_vdev_create_params(struct hdd_adapter *adapter,
struct wlan_vdev_create_params *vdev_params)
@@ -15177,7 +15177,7 @@ destroy_sync:
return status;
}
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
static
uint8_t *wlan_hdd_get_mlo_intf_addr(struct hdd_context *hdd_ctx,
enum QDF_OPMODE interface_type)
@@ -16508,7 +16508,7 @@ void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
mutex_unlock(&hdd_ctx->sap_lock);
}
#ifdef WLAN_FEATURE_11BE_MLO
#if defined(WLAN_FEATURE_11BE_MLO) && defined(CFG80211_11BE_BASIC)
/**
* wlan_hdd_mlo_sap_reinit() - handle mlo scenario for ssr
* @hdd_ctx: Pointer to hdd context

3
core/hdd/src/wlan_hdd_mlo.c
View File

@@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -25,6 +26,7 @@
#include "wlan_hdd_mlo.h"
#include "osif_vdev_sync.h"
#if defined(CFG80211_11BE_BASIC)
void hdd_update_mld_mac_addr(struct hdd_context *hdd_ctx,
struct qdf_mac_addr hw_macaddr)
{
@@ -324,3 +326,4 @@ struct hdd_adapter *hdd_get_ml_adater(struct hdd_context *hdd_ctx)
return NULL;
}
#endif