wifi: ath12k: Consolidate WMI peer flags

Currently wmi.h has two separate set of definitions for peer
flags. One set of flags is defined in enum wmi_tlv_peer_flags, and,
except for the last three, are named WMI_TLV_PEER_*. The other set of
flags are defined as macros, and are named WMI_PEER_*. The last three
macros have the same name as the last three wmi_tlv_peer_flags
enumerators.

The code only uses the WMI_PEER_* names; the WMI_TLV_PEER_* names are
unused. So as a first step in consolidation, remove all the
WMI_TLV_PEER_* names.

But since having an enum to define all the flags is actually a good
thing since that provides a handle by which to refer to the entire set
of flags, recast the WMI_PEER_* macros into enumerators.

Compile tested only.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231106-ath-peer-flags-v1-4-781e83b7e8e8@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 7d295330e6f1240656acc5cd6e1ce4994aa8d207..811aeea34e34fd322d53e6c693c20f17258949b1 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause-Clear */
 /*
  * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef ATH12K_WMI_H
@@ -1146,25 +1146,27 @@ enum wmi_tlv_vdev_param {
 };
 
 enum wmi_tlv_peer_flags {
-       WMI_TLV_PEER_AUTH = 0x00000001,
-       WMI_TLV_PEER_QOS = 0x00000002,
-       WMI_TLV_PEER_NEED_PTK_4_WAY = 0x00000004,
-       WMI_TLV_PEER_NEED_GTK_2_WAY = 0x00000010,
-       WMI_TLV_PEER_APSD = 0x00000800,
-       WMI_TLV_PEER_HT = 0x00001000,
-       WMI_TLV_PEER_40MHZ = 0x00002000,
-       WMI_TLV_PEER_STBC = 0x00008000,
-       WMI_TLV_PEER_LDPC = 0x00010000,
-       WMI_TLV_PEER_DYN_MIMOPS = 0x00020000,
-       WMI_TLV_PEER_STATIC_MIMOPS = 0x00040000,
-       WMI_TLV_PEER_SPATIAL_MUX = 0x00200000,
-       WMI_TLV_PEER_VHT = 0x02000000,
-       WMI_TLV_PEER_80MHZ = 0x04000000,
-       WMI_TLV_PEER_PMF = 0x08000000,
+       WMI_PEER_AUTH           = 0x00000001,
+       WMI_PEER_QOS            = 0x00000002,
+       WMI_PEER_NEED_PTK_4_WAY = 0x00000004,
+       WMI_PEER_NEED_GTK_2_WAY = 0x00000010,
+       WMI_PEER_HE             = 0x00000400,
+       WMI_PEER_APSD           = 0x00000800,
+       WMI_PEER_HT             = 0x00001000,
+       WMI_PEER_40MHZ          = 0x00002000,
+       WMI_PEER_STBC           = 0x00008000,
+       WMI_PEER_LDPC           = 0x00010000,
+       WMI_PEER_DYN_MIMOPS     = 0x00020000,
+       WMI_PEER_STATIC_MIMOPS  = 0x00040000,
+       WMI_PEER_SPATIAL_MUX    = 0x00200000,
+       WMI_PEER_TWT_REQ        = 0x00400000,
+       WMI_PEER_TWT_RESP       = 0x00800000,
+       WMI_PEER_VHT            = 0x02000000,
+       WMI_PEER_80MHZ          = 0x04000000,
+       WMI_PEER_PMF            = 0x08000000,
        WMI_PEER_IS_P2P_CAPABLE = 0x20000000,
        WMI_PEER_160MHZ         = 0x40000000,
        WMI_PEER_SAFEMODE_EN    = 0x80000000,
-
 };
 
 enum wmi_tlv_peer_flags_ext {
@@ -3844,31 +3846,6 @@ struct wmi_unit_test_cmd {
 
 #define MAX_SUPPORTED_RATES 128
 
-#define WMI_PEER_AUTH          0x00000001
-#define WMI_PEER_QOS           0x00000002
-#define WMI_PEER_NEED_PTK_4_WAY        0x00000004
-#define WMI_PEER_NEED_GTK_2_WAY        0x00000010
-#define WMI_PEER_HE            0x00000400
-#define WMI_PEER_APSD          0x00000800
-#define WMI_PEER_HT            0x00001000
-#define WMI_PEER_40MHZ         0x00002000
-#define WMI_PEER_STBC          0x00008000
-#define WMI_PEER_LDPC          0x00010000
-#define WMI_PEER_DYN_MIMOPS    0x00020000
-#define WMI_PEER_STATIC_MIMOPS 0x00040000
-#define WMI_PEER_SPATIAL_MUX   0x00200000
-#define WMI_PEER_TWT_REQ       0x00400000
-#define WMI_PEER_TWT_RESP      0x00800000
-#define WMI_PEER_VHT           0x02000000
-#define WMI_PEER_80MHZ         0x04000000
-#define WMI_PEER_PMF           0x08000000
-/* TODO: Place holder for WLAN_PEER_F_PS_PRESEND_REQUIRED = 0x10000000.
- * Need to be cleaned up
- */
-#define WMI_PEER_IS_P2P_CAPABLE        0x20000000
-#define WMI_PEER_160MHZ                0x40000000
-#define WMI_PEER_SAFEMODE_EN   0x80000000
-
 struct ath12k_wmi_vht_rate_set_params {
        __le32 tlv_header;
        __le32 rx_max_rate;