Fix mistakes in definition of QCA vendor commands for indoor location
authorLior David <qca_liord@qca.qualcomm.com>
Tue, 6 Sep 2016 13:16:42 +0000 (16:16 +0300)
committerJouni Malinen <j@w1.fi>
Tue, 6 Sep 2016 20:38:47 +0000 (23:38 +0300)
Fix some mistakes in the previous commit for adding QCA vendor commands
for indoor location.

Note: The renamed enum value does not change the ABI, but the addition
of QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INVALID in the beginning of enum
qca_wlan_vendor_attr_ftm_meas does renumber
QCA_WLAN_VENDOR_ATTR_FTM_MEAS_* values. The previous values were
committed yesterday and have not been used in any released code yet, so
this is a justifiable quick fix.

Signed-off-by: Lior David <qca_liord@qca.qualcomm.com>
src/common/qca-vendor.h

index 0f36e66..a17764e 100644 (file)
@@ -1080,7 +1080,7 @@ enum qca_wlan_vendor_attr_loc_capa_flags {
  * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAC_ADDR: The MAC address of the peer.
  * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAGS: Various flags related
  *     to measurement. See enum qca_wlan_vendor_attr_ftm_peer_meas_flags.
- * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAM: Nested attribute of
+ * @QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS: Nested attribute of
  *     FTM measurement parameters, as specified by IEEE P802.11-REVmc/D7.0
  *     9.4.2.167. See enum qca_wlan_vendor_attr_ftm_meas_param for
  *     list of supported attributes.
@@ -1094,7 +1094,7 @@ enum qca_wlan_vendor_attr_ftm_peer_info {
        QCA_WLAN_VENDOR_ATTR_FTM_PEER_INVALID,
        QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAC_ADDR,
        QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAGS,
-       QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAM,
+       QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS,
        QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID,
        QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD,
        /* keep last */
@@ -1287,6 +1287,7 @@ enum qca_vendor_attr_loc_session_status {
  * @QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PAD: Dummy attribute for padding.
  */
 enum qca_wlan_vendor_attr_ftm_meas {
+       QCA_WLAN_VENDOR_ATTR_FTM_MEAS_INVALID,
        QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T1,
        QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T2,
        QCA_WLAN_VENDOR_ATTR_FTM_MEAS_T3,