ath11k: cleanup warnings due to conflicting enum types
PATCH 1/1 ath11k: cleanup warnings due to conflicting enum types
Cleanup warnings due to conflicting enum typesdfs_reg and ath11k_dfs_region
This will resolve the below warning.
"drivers/net/wireless/ath/ath11k/wmi.c:4597:34:
warning: mixing different enum types"
Signed-off-by Sriram R <[email protected]>
--- drivers/net/wireless/ath/ath11k/reg.c | 16 ++++++++-------- drivers/net/wireless/ath/ath11k/wmi.h | 12 +----------- 2 files changed, 9 insertions(+), 19 deletions(-)
drivers/net/wireless/ath/ath11k/reg.c +8 -8
@@ -263,16 +263,16 @@ int ath11k_regd_update(struct ath11k *ar, bool init) }static enum nl80211_dfs_regions -ath11k_map_fw_dfs_region (enum dfs_reg dfs_region) +ath11k_map_fw_dfs_region (enum ath11k_dfs_region dfs_region) {switch (dfs_region) { -case DFS_FCC_REG : -case DFS_CN_REG : +case ATH11K_DFS_REG_FCC : +case ATH11K_DFS_REG_CN :return NL80211_DFS_FCC ; -case DFS_ETSI_REG : -case DFS_KR_REG : +case ATH11K_DFS_REG_ETSI : +case ATH11K_DFS_REG_KR :return NL80211_DFS_ETSI ; -case DFS_MKK_REG : +case ATH11K_DFS_REG_MKK :return NL80211_DFS_JP ;default :return NL80211_DFS_UNSET ;
@@ -568,7 +568,7 @@ ath11k_reg_build_regd(struct ath11k_base *ab, goto ret;/* Add max additional rules to accommodate weather radar band */ -if (reg_info->dfs_region ==DFS_ETSI_REG ) +if (reg_info->dfs_region ==ATH11K_DFS_REG_ETSI ) num_rules +=2 ; tmp_regd = kzalloc(sizeof(*tmp_regd) +
@@ -631,7 +631,7 @@ ath11k_reg_build_regd(struct ath11k_base *ab,* need to update that for other rules. */ if (flags &NL80211_RRF_DFS && - reg_info->dfs_region ==DFS_ETSI_REG && + reg_info->dfs_region ==ATH11K_DFS_REG_ETSI && (reg_rule->end_freq >ETSI_WEATHER_RADAR_BAND_LOW && reg_rule->start_freq <ETSI_WEATHER_RADAR_BAND_HIGH )){ ath11k_reg_update_weather_radar_band(ab, tmp_regd,
drivers/net/wireless/ath/ath11k/wmi.h +1 -11
@@ -4283,16 +4283,6 @@ enum cc_setting_code { REG_SET_CC_STATUS_FAIL = 5, }; -enum dfs_reg { -DFS_UNINIT_REG =0 , -DFS_FCC_REG =1 , -DFS_ETSI_REG =2 , -DFS_MKK_REG =3 , -DFS_CN_REG =4 , -DFS_KR_REG =5 , -DFS_UNDEF_REG -}; -/* Regaulatory Rule Flags Passed by FW */ #define REGULATORY_CHAN_DISABLED BIT(0)#define REGULATORY_CHAN_NO_IR BIT(1)
@@ -4331,7 +4321,7 @@ struct cur_regulatory_info {u16 reg_dmn_pair;u16 ctry_code;u8 alpha2[REG_ALPHA2_LEN +1 ]; -enum dfs_reg dfs_region; +u32 dfs_region;u32 phybitmap;u32 min_bw_2g;u32 max_bw_2g;
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 10 lines · Sriram R
Cleanup warnings due to conflicting enum types
dfs_regandath11k_dfs_regionThis will resolve the below warning.
"
drivers/net/wireless/ath/ath11k/wmi.c:4597:34:
warning: mixing different enum types"Signed-off-by Sriram R <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-bringup branch of ath.git, thanks.
1bf43cd058ec ath11k: cleanup warnings due to conflicting enum types
Signature · 9 lines
https://patchwork.kernel.org/patch/10991021/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k