[PATCH] wifi: ath11k: remove duplicate definitions in wmi.h

[PATCH] wifi: ath11k: remove duplicate definitions in wmi.h

[Kang Yang]

There are some duplicate definitions in wmi.h, remove them.

No functional changes, compile tested only.

Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
---
 drivers/net/wireless/ath/ath11k/wmi.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index bb419e3abb00..9652f4eb2f32 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -60,10 +60,6 @@ struct wmi_tlv {
 #define WLAN_SCAN_MAX_HINT_BSSID         10
 #define MAX_RNR_BSS                    5
 
-#define WLAN_SCAN_MAX_HINT_S_SSID        10
-#define WLAN_SCAN_MAX_HINT_BSSID         10
-#define MAX_RNR_BSS                    5
-
 #define WLAN_SCAN_PARAMS_MAX_SSID    16
 #define WLAN_SCAN_PARAMS_MAX_BSSID   4
 #define WLAN_SCAN_PARAMS_MAX_IE_LEN  256
@@ -5740,8 +5736,6 @@ struct wmi_debug_log_config_cmd_fixed_param {
 	u32 value;
 } __packed;
 
-#define WMI_MAX_MEM_REQS 32
-
 #define MAX_RADIOS 3
 
 #define WMI_SERVICE_READY_TIMEOUT_HZ (5 * HZ)

base-commit: ffd4e60352172cc167ff74e8bfd8a331a5830013
-- 
2.34.1

Re: [PATCH] wifi: ath11k: remove duplicate definitions in wmi.h

[Jeff Johnson]

On 3/13/2024 7:16 PM, Kang Yang wrote:
> There are some duplicate definitions in wmi.h, remove them.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
> ---
>  drivers/net/wireless/ath/ath11k/wmi.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
> index bb419e3abb00..9652f4eb2f32 100644
> --- a/drivers/net/wireless/ath/ath11k/wmi.h
> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
> @@ -60,10 +60,6 @@ struct wmi_tlv {
>  #define WLAN_SCAN_MAX_HINT_BSSID         10
>  #define MAX_RNR_BSS                    5
>  
> -#define WLAN_SCAN_MAX_HINT_S_SSID        10
> -#define WLAN_SCAN_MAX_HINT_BSSID         10
> -#define MAX_RNR_BSS                    5
> -
>  #define WLAN_SCAN_PARAMS_MAX_SSID    16
>  #define WLAN_SCAN_PARAMS_MAX_BSSID   4
>  #define WLAN_SCAN_PARAMS_MAX_IE_LEN  256

This patch doesn't apply (when using b4 shazam) when trying to verify with the
'pending' branch due to a pending change to WLAN_SCAN_PARAMS_MAX_IE_LEN.

So I verified against ath-next instead.

I'll let Kalle comment on if he can handle the conflict himself or if he wants
a rebased patch.

Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Re: [PATCH] wifi: ath11k: remove duplicate definitions in wmi.h

[Kalle Valo]

Kang Yang <quic_kangyang@quicinc.com> wrote:

> There are some duplicate definitions in wmi.h, remove them.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

There was a conflict but git-am handled that automatically:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=5955a10e0a46d46216420b8d2b6c0a1c895892af

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20240314021654.304451-1-quic_kangyang@quicinc.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH] wifi: ath11k: remove duplicate definitions in wmi.h

[Kalle Valo]

Kang Yang <quic_kangyang@quicinc.com> wrote:

> There are some duplicate definitions in wmi.h, remove them.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>

Patch applied to ath-next branch of ath.git, thanks.

3b8e475b27d7 wifi: ath11k: remove duplicate definitions in wmi.h

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20240314021654.304451-1-quic_kangyang@quicinc.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches