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@xxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxx>
