From 78100a4cfe8b0c08bc0c362f5bbf779b083e4990 Mon Sep 17 00:00:00 2001 From: Yu Ouyang Date: Thu, 2 Jan 2020 14:38:32 +0800 Subject: [PATCH] qcacmn: Fix function parameter type conflict issue Parameter freq type has a conflict in reg_is_dsrc_freq(qdf_freq_t freq) and reg_is_dsrc_freq(uint16_t freq) functions. Change the type to qdf_freq_t in these functions. Change-Id: I4c348778a7cb2fd588799332241701357de90422 CRs-Fixed: 2595642 --- umac/regulatory/core/src/reg_utils.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/umac/regulatory/core/src/reg_utils.h b/umac/regulatory/core/src/reg_utils.h index dc714b0c3c3f..059c1b3240c1 100644 --- a/umac/regulatory/core/src/reg_utils.h +++ b/umac/regulatory/core/src/reg_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -516,7 +516,7 @@ bool reg_get_fcc_constraint(struct wlan_objmgr_pdev *pdev, uint32_t freq) * Return: true or false */ #ifdef CONFIG_CHAN_FREQ_API -bool reg_is_dsrc_freq(uint16_t freq); +bool reg_is_dsrc_freq(qdf_freq_t freq); #endif /* CONFIG_CHAN_FREQ_API*/ #ifdef CONFIG_CHAN_NUM_API @@ -567,7 +567,7 @@ static inline bool reg_is_dsrc_chan(struct wlan_objmgr_pdev *pdev, return false; } -static inline bool reg_is_dsrc_freq(uint16_t freq) +static inline bool reg_is_dsrc_freq(qdf_freq_t freq) { return false; } @@ -612,7 +612,7 @@ static inline bool reg_is_dsrc_chan(struct wlan_objmgr_pdev *pdev, return false; } -static inline bool reg_is_dsrc_freq(uint16_t freq) +static inline bool reg_is_dsrc_freq(qdf_freq_t freq) { return false; }