Merge "qcawifi: Correct RSSI/SNR naming convention"

umac/cp_stats/dispatcher/inc/wlan_cp_stats_ic_defs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018, 2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -445,7 +445,7 @@ struct vdev_ic_cp_stats {
  * as interface structure with user space application
  * make sure to align this structure with ieee80211_nodestats always
  *
- *  @cs_rx_mgmt_rssi: rx mgmt rssi
+ *  @cs_rx_mgmt_snr: rx mgmt snr
  *  @cs_rx_mgmt: rx mgmt
  *  @cs_rx_noprivacy: rx no privacy
  *  @cs_rx_wepfail: rx wep failures
@@ -463,7 +463,7 @@ struct vdev_ic_cp_stats {
  *  @cs_rx_decryptcrc: rx decrypt errors
  */
 struct peer_ic_cp_stats {
-	int8_t   cs_rx_mgmt_rssi;
+	int8_t   cs_rx_mgmt_snr;
 	uint32_t cs_rx_mgmt;
 	uint32_t cs_rx_noprivacy;
 	uint32_t cs_rx_wepfail;

umac/cp_stats/dispatcher/inc/wlan_cp_stats_ic_ucfg_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018, 2020-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -643,8 +643,8 @@ UCFG_PEER_CP_STATS_SET_FUNCS(twt_wake_intvl_us);
 UCFG_PEER_CP_STATS_SET_FUNCS(twt_sp_offset_us);
 
 static inline
-void ucfg_peer_cp_stats_rx_mgmt_rssi_update(struct wlan_objmgr_peer *peer,
-					    int8_t rssi)
+void ucfg_peer_cp_stats_rx_mgmt_snr_update(struct wlan_objmgr_peer *peer,
+					   int8_t snr)
 {
 	struct peer_cp_stats *peer_cs;
 	struct peer_ic_cp_stats *peer_cps;
@@ -658,11 +658,11 @@ void ucfg_peer_cp_stats_rx_mgmt_rssi_update(struct wlan_objmgr_peer *peer,
 
 	peer_cps = peer_cs->peer_stats;
 	if (peer_cps)
-		peer_cps->cs_rx_mgmt_rssi = rssi;
+		peer_cps->cs_rx_mgmt_snr = snr;
 }
 
 static inline
-int8_t ucfg_peer_cp_stats_rx_mgmt_rssi_get(struct wlan_objmgr_peer *peer)
+int8_t ucfg_peer_cp_stats_rx_mgmt_snr_get(struct wlan_objmgr_peer *peer)
 {
 	struct peer_cp_stats *peer_cs;
 	struct peer_ic_cp_stats *peer_cps;
@@ -677,7 +677,7 @@ int8_t ucfg_peer_cp_stats_rx_mgmt_rssi_get(struct wlan_objmgr_peer *peer)
 
 	peer_cps = peer_cs->peer_stats;
 	if (peer_cps)
-		val = peer_cps->cs_rx_mgmt_rssi;
+		val = peer_cps->cs_rx_mgmt_snr;
 
 	return val;
 }

umac/cp_stats/dispatcher/inc/wlan_cp_stats_ic_utils_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018, 2020-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -91,16 +91,16 @@ PEER_CP_STATS_GET_FUNCS(tx_dropblock);
 PEER_CP_STATS_GET_FUNCS(rx_decryptcrc);
 
 static inline void
-peer_cp_stats_rx_mgmt_rssi_update(struct wlan_objmgr_peer *peer,
-				  int8_t rssi)
+peer_cp_stats_rx_mgmt_snr_update(struct wlan_objmgr_peer *peer,
+				 int8_t snr)
 {
-	ucfg_peer_cp_stats_rx_mgmt_rssi_update(peer, rssi);
+	ucfg_peer_cp_stats_rx_mgmt_snr_update(peer, snr);
 }
 
 static inline int8_t
-peer_cp_stats_rx_mgmt_rssi_get(struct wlan_objmgr_peer *peer)
+peer_cp_stats_rx_mgmt_snr_get(struct wlan_objmgr_peer *peer)
 {
-	return ucfg_peer_cp_stats_rx_mgmt_rssi_get(peer);
+	return ucfg_peer_cp_stats_rx_mgmt_snr_get(peer);
 }
 
 #define VDEV_UCAST_CP_STATS_SET_FUNCS(field) \