Received-SPF: pass (google.com: domain of linux-wireless+bounces-4751-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <415bd131-7305-4e9b-8b14-c3104a23312a@quicinc.com>
Date: Thu, 14 Mar 2024 08:05:10 -0700
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] wifi: ath11k: remove duplicate definitions in wmi.h
Content-Language: en-US
To: Kang Yang <quic_kangyang@quicinc.com>, <ath11k@lists.infradead.org>
CC: <linux-wireless@vger.kernel.org>
References: <20240314021654.304451-1-quic_kangyang@quicinc.com>
From: Jeff Johnson <quic_jjohnson@quicinc.com>
In-Reply-To: <20240314021654.304451-1-quic_kangyang@quicinc.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

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>