diff options
| author | Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com> | 2023-04-05 12:44:57 +0900 |
|---|---|---|
| committer | Paul Chen <chenpaul@google.com> | 2023-04-14 13:20:31 +0800 |
| commit | 875d2d33365613c5ac0ca9ecaed42a58517beac0 (patch) | |
| tree | b019035d0e23548268d08efaa1779ecec9cd570b | |
| parent | d1664cbf30c2c180d838dea37893c6e32f1c82c0 (diff) | |
| download | bcm4389-android-gs-bluejay-5.10-u-beta3.tar.gz | |
bcmdhd: Update the right band information for 6G channels in regulatory infoandroid-u-beta-3_r0.3android-u-beta-3_r0.2android-u-beta-2.1_r0.4android-u-beta-2.1_r0.3android-u-beta-2.1_r0.2android-gs-raviole-5.10-u-beta3android-gs-raviole-5.10-u-beta2android-gs-pantah-5.10-u-beta2android-gs-bluejay-5.10-u-beta3android-gs-bluejay-5.10-u-beta2
Bug: 276978584
Test: Code Drop Test
Change-Id: I8df7744efc83d911eea3b2970beb9d9dde45203f
Signed-off-by: Dennis Jeon <dennis.jeon@broadcom.corp-partner.google.com>
| -rw-r--r-- | wl_cfg80211.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/wl_cfg80211.h b/wl_cfg80211.h index 83308b2..7c59b26 100644 --- a/wl_cfg80211.h +++ b/wl_cfg80211.h @@ -158,6 +158,16 @@ typedef sta_info_v4_t wlcfg_sta_info_t; #define MSCS_CFG_DEF_TCLAS_MASK 0x5Fu /* TCLAS mask */ #endif /* MSCS_CFG_DEF_TCLAS_MASK */ +#if defined(CONFIG_6GHZ_BKPORT) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) +/* Native 6GHz band supported available. For Backported + * kernels, kernels/customer makefiles should explicitly + * define CONFIG_6GHZ_BKPORT + */ +#if defined(WL_6G_BAND) +#define CFG80211_6G_SUPPORT +#endif +#endif /* CONFIG_6GHZ_BKPORT || LINUX_VER >= 5.4 */ + #define CH_TO_CHSPC(band, _channel) \ ((_channel | band) | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE) #define CHAN2G(_channel, _freq, _flags) { \ @@ -260,16 +270,6 @@ typedef sta_info_v4_t wlcfg_sta_info_t; #endif /* WAIT_FOR_DISCONNECT_MAX */ #define WAIT_FOR_DISCONNECT_STATE_SYNC 10 -#if defined(CONFIG_6GHZ_BKPORT) || (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) -/* Native 6GHz band supported available. For Backported - * kernels, kernels/customer makefiles should explicitly - * define CONFIG_6GHZ_BKPORT - */ -#if defined(WL_6G_BAND) -#define CFG80211_6G_SUPPORT -#endif -#endif /* CONFIG_6GHZ_BKPORT || LINUX_VER >= 5.4 */ - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)) /* Newer kernels use defines from nl80211.h */ #define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ |