lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Enable HE phy cap indication

Browse Source 
Function hdd_update_wiphy_he_cap() was added to populate 11ax
related HE phy capabilities into the wiphy structure, but it
was wrongly enclosed by the 6GHz related conditional macros.

Enable the above function for compilation when 11ax is
supported or when kernel 4.19 or later is used.

NOTE: The kernel side support for HE phy capability was
      introduced by:

      commit <c4cbaf7973a794839af080f13748335976cf3f3f>
      cfg80211: Add support for HE

      in kernel 4.19, and should be back-ported if any
      older kernel intends to support 11ax.

Change-Id: I6fe303ce381528be4246bf4761f6483a2f82995f
CRs-Fixed: 2731627
This commit is contained in:
wadesong 2020-07-14 17:08:13 +08:00 committed by snandini
parent 1939a20df7
commit 0237690ac4
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1709,16 +1709,15 @@ struct hdd_context {
struct ieee80211_channel *channels_2ghz;
struct ieee80211_channel *channels_5ghz;
#if (defined(CONFIG_BAND_6GHZ) && defined(CFG80211_6GHZ_BAND_SUPPORTED)) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
#if defined(WLAN_FEATURE_11AX) && \
(defined(CFG80211_SBAND_IFTYPE_DATA_BACKPORT) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)))
struct ieee80211_sband_iftype_data *iftype_data_2g;
struct ieee80211_sband_iftype_data *iftype_data_5g;
#endif
#if defined(CONFIG_BAND_6GHZ) && (defined(CFG80211_6GHZ_BAND_SUPPORTED) || \
(KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE))
struct ieee80211_sband_iftype_data *iftype_data_6g;
#endif
#endif
/* Completion variable to indicate Mc Thread Suspended */
struct completion mc_sus_event_var;

5
core/hdd/src/wlan_hdd_cfg80211.c
View File

@ -15754,8 +15754,9 @@ wlan_hdd_populate_5dot9_chan_info(struct hdd_context *hdd_ctx, uint32_t index)
#endif
#if (defined(CONFIG_BAND_6GHZ) && defined(CFG80211_6GHZ_BAND_SUPPORTED)) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))
#if defined(WLAN_FEATURE_11AX) && \
(defined(CFG80211_SBAND_IFTYPE_DATA_BACKPORT) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)))
#if defined(CONFIG_BAND_6GHZ) && (defined(CFG80211_6GHZ_BAND_SUPPORTED) || \
(KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE))
static QDF_STATUS

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

@ -2087,8 +2087,9 @@ static void hdd_extract_fw_version_info(struct hdd_context *hdd_ctx)
HDD_FW_VER_REL_ID(hdd_ctx->target_fw_vers_ext);
}
#if (((defined(CONFIG_BAND_6GHZ) && defined(CFG80211_6GHZ_BAND_SUPPORTED)) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))) && defined(WLAN_FEATURE_11AX))
#if defined(WLAN_FEATURE_11AX) && \
(defined(CFG80211_SBAND_IFTYPE_DATA_BACKPORT) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0)))
#if defined(CONFIG_BAND_6GHZ) && (defined(CFG80211_6GHZ_BAND_SUPPORTED) || \
(KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE))
static void