nss-drv: 11.4 split out formatting from 12.4 backbort

This is mostly a cosmetic change and meant to make it easier to see
the to see history of commits.

The currently published NSS FW on QUIC's repo is:

NSS.HK.11.4.0.5-5-R which is on branch caf_migration/NHSS.QSDK.11.4.0.5

However, it's not the latest of the `11.4.0.5` release which is

NSS.HK.11.4.0.5-6-R which is on branch `origin/NSS_11.4.0.5`

Although the versions look to be minor releases. NSS driver shows
significant changes in the headers files concerning `wifi` and `wifi
mesh`.

When doing a diff between the 2 releases, it was hard to tell exactly
what changed because most of it seemed to be non-functional changes,
formatting, etc. This patch is only meant to make the files visually
similiar between the two releases, to better show functional changes.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
This commit is contained in:
Sean Khan 2024-07-08 10:16:00 -04:00
parent f7d8d21b3d
commit bacbac33cb
2 changed files with 153 additions and 162 deletions

View File

@ -626,16 +626,14 @@
* Configure the maximum number of IPv4/IPv6
* connections supported by the accelerator.
*/
- nss_ipv4_conn_cfg = max_ipv4_conn;
+#ifdef NSS_DRV_IPV4_ENABLE
+ nss_ipv4_conn_cfg = max_ipv4_conn;
nss_ipv4_conn_cfg = max_ipv4_conn;
+ nss_ipv4_update_conn_count(max_ipv4_conn);
+#endif
+
#ifdef NSS_DRV_IPV6_ENABLE
nss_ipv6_conn_cfg = max_ipv6_conn;
- nss_ipv6_update_conn_count(max_ipv6_conn);
+ nss_ipv6_update_conn_count(max_ipv6_conn);
nss_ipv6_update_conn_count(max_ipv6_conn);
#endif
- nss_ipv4_update_conn_count(max_ipv4_conn);
@ -1909,94 +1907,6 @@
*/
struct nss_wifi_mesh_mpath_not_found_msg {
uint8_t dest_mac_addr[ETH_ALEN]; /**< Destination MAC address. */
@@ -386,27 +386,27 @@ struct nss_wifi_mesh_path_expiry_msg {
* Encapsulation statistics.
*/
struct nss_wifi_mesh_encap_stats {
- uint32_t expiry_notify_sent; /* Number of times expiry notification sent to host. */
- uint32_t mc_count; /* Number of multicast packets. */
- uint32_t mp_not_found; /* Number of times mesh path is not found. */
- uint32_t mp_active; /* Number of times mesh path is active. */
- uint32_t mpp_not_found; /* Number of times proxy path is not found. */
- uint32_t mpp_found; /* Number of times proxy path is found. */
- uint32_t encap_hdr_fail; /* Number of times encapsulating mesh header failed. */
- uint32_t mp_del_notify_fail; /* Number of times notifying mesh path delete failed. */
- uint32_t link_enqueue; /* Number of packets enqueued to the link VAP. */
- uint32_t link_enq_fail; /* Number of times enqueue to link vap failed. */
- uint32_t ra_lup_fail; /* Number of times receiver address look up is failed. */
- uint32_t dummy_add_count; /* Number of times dummy path is added. */
- uint32_t encap_mp_add_notify_fail; /* Number of times add notification failed. */
- uint32_t dummy_add_fail; /* Number of times dummy addition failed. */
- uint32_t dummy_lup_fail; /* Number of times dummy lookup failed. */
- uint32_t send_to_host_failed; /* Number of packets failed to be sent to host. */
- uint32_t sent_to_host; /* Number of packets sent to host. */
- uint32_t expiry_notify_fail; /* Number of times expiry notification to host failed. */
- uint32_t no_headroom; /* Number of packets dropped because there is no headroom. */
- uint32_t path_refresh_sent; /* Number of times path refresh is sent to host. */
- uint32_t linearise_failed; /* Number of packets dropped because pb_linearise. */
+ uint32_t expiry_notify_sent; /**< Number of times expiry notification sent to host. */
+ uint32_t mc_count; /**< Number of multicast packets. */
+ uint32_t mp_not_found; /**< Number of times mesh path is not found. */
+ uint32_t mp_active; /**< Number of times mesh path is active. */
+ uint32_t mpp_not_found; /**< Number of times proxy path is not found. */
+ uint32_t mpp_found; /**< Number of times proxy path is found. */
+ uint32_t encap_hdr_fail; /**< Number of times encapsulating mesh header failed. */
+ uint32_t mp_del_notify_fail; /**< Number of times notifying mesh path delete failed. */
+ uint32_t link_enqueue; /**< Number of packets enqueued to the link VAP. */
+ uint32_t link_enq_fail; /**< Number of times enqueue to link vap failed. */
+ uint32_t ra_lup_fail; /**< Number of times receiver address look up is failed. */
+ uint32_t dummy_add_count; /**< Number of times dummy path is added. */
+ uint32_t encap_mp_add_notify_fail; /**< Number of times add notification failed. */
+ uint32_t dummy_add_fail; /**< Number of times dummy addition failed. */
+ uint32_t dummy_lup_fail; /**< Number of times dummy lookup failed. */
+ uint32_t send_to_host_failed; /**< Number of packets failed to be sent to host. */
+ uint32_t sent_to_host; /**< Number of packets sent to host. */
+ uint32_t expiry_notify_fail; /**< Number of times expiry notification to host failed. */
+ uint32_t no_headroom; /**< Number of packets dropped because there is no headroom. */
+ uint32_t path_refresh_sent; /**< Number of times path refresh is sent to host. */
+ uint32_t linearise_failed; /**< Number of packets dropped because pb_linearise. */
};
/*
@@ -526,22 +526,22 @@ struct nss_wifi_mesh_path_stats {
* Wi-Fi mesh proxy path statistics.
*/
struct nss_wifi_mesh_proxy_path_stats {
- uint32_t alloc_failures; /**< Mesh proxy path alloc failure count. */
- uint32_t entry_exist_failures; /**< Mesh proxy path entry already exists. */
- uint32_t add_success; /**< Mesh proxy path add success count. */
- uint32_t table_full_errors; /**< Mesh proxy path table full count. */
- uint32_t insert_failures; /**< Mesh proxy path insert failure count. */
- uint32_t not_found; /**< Mesh proxy path not found count. */
- uint32_t unhashed_errors; /**< Mesh proxy path unhased erorr count. */
- uint32_t delete_failures; /**< Mesh proxy path delete failure count. */
- uint32_t delete_success; /**< Mesh proxy path delete success count. */
- uint32_t update_success; /**< Mesh proxy path update success count. */
- uint32_t lookup_success; /**< Mesh proxy path lookup success count. */
- uint32_t add_requests; /**< Mesh proxy path addition requests. */
- uint32_t del_requests; /**< Mesh proxy path deletion requests. */
- uint32_t update_requests; /**< Mesh proxy path updation requests. */
- uint32_t mda_updations; /**< Mesh proxy path mda updations. */
- uint32_t flag_updations; /**< Mesh proxy path flags updations. */
+ uint32_t alloc_failures; /**< Mesh proxy path allocation failure count. */
+ uint32_t entry_exist_failures; /**< Mesh proxy path entry already exists. */
+ uint32_t add_success; /**< Mesh proxy path add success count. */
+ uint32_t table_full_errors; /**< Mesh proxy path table full count. */
+ uint32_t insert_failures; /**< Mesh proxy path insert failure count. */
+ uint32_t not_found; /**< Mesh proxy path not found count. */
+ uint32_t unhashed_errors; /**< Mesh proxy path unhased erorr count. */
+ uint32_t delete_failures; /**< Mesh proxy path delete failure count. */
+ uint32_t delete_success; /**< Mesh proxy path delete success count. */
+ uint32_t update_success; /**< Mesh proxy path update success count. */
+ uint32_t lookup_success; /**< Mesh proxy path lookup success count. */
+ uint32_t add_requests; /**< Mesh proxy path addition requests. */
+ uint32_t del_requests; /**< Mesh proxy path deletion requests. */
+ uint32_t update_requests; /**< Mesh proxy path updation requests. */
+ uint32_t mda_updations; /**< Mesh proxy path mda updations. */
+ uint32_t flag_updations; /**< Mesh proxy path flags updations. */
};
/**
@@ -958,7 +958,7 @@ nss_tx_status_t nss_wifi_mesh_tx_msg_ext
/**
@ -2184,66 +2094,6 @@
ssize_t bytes_read = 0;
struct nss_stats_data *data = fp->private_data;
int ifindex;
--- a/nss_wifi_mesh_strings.c
+++ b/nss_wifi_mesh_strings.c
@@ -53,7 +53,7 @@ struct nss_stats_info nss_wifi_mesh_stri
{"expiry_notify_fail", NSS_STATS_TYPE_SPECIAL},
{"no_headroom", NSS_STATS_TYPE_SPECIAL},
{"path_refresh_sent", NSS_STATS_TYPE_SPECIAL},
- {"linearise_failed", NSS_STATS_TYPE_SPECIAL}
+ {"linearise_failed", NSS_STATS_TYPE_SPECIAL},
};
/*
@@ -89,7 +89,8 @@ struct nss_stats_info nss_wifi_mesh_stri
{"flag_updations", NSS_STATS_TYPE_SPECIAL},
{"metric_updations", NSS_STATS_TYPE_SPECIAL},
{"block_mesh_fwd_updations", NSS_STATS_TYPE_SPECIAL},
- {"delete_failures", NSS_STATS_TYPE_SPECIAL}
+ {"delete_failures", NSS_STATS_TYPE_SPECIAL},
+
};
/*
@@ -106,22 +107,22 @@ static ssize_t nss_wifi_mesh_path_stats_
* Wi-Fi mesh proxy path statistics string.
*/
struct nss_stats_info nss_wifi_mesh_strings_proxy_path_stats[NSS_WIFI_MESH_PROXY_PATH_STATS_TYPE_MAX] = {
- {"alloc_failures", NSS_STATS_TYPE_SPECIAL},
- {"entry_exist_failures", NSS_STATS_TYPE_SPECIAL},
- {"add_success", NSS_STATS_TYPE_SPECIAL},
- {"table_full_errors", NSS_STATS_TYPE_SPECIAL},
- {"insert_failures", NSS_STATS_TYPE_SPECIAL},
- {"not_found", NSS_STATS_TYPE_SPECIAL},
- {"unhashed_errors", NSS_STATS_TYPE_SPECIAL},
- {"delete_failures", NSS_STATS_TYPE_SPECIAL},
- {"delete_success", NSS_STATS_TYPE_SPECIAL},
- {"update_success", NSS_STATS_TYPE_SPECIAL},
- {"lookup_success", NSS_STATS_TYPE_SPECIAL},
- {"add_requests", NSS_STATS_TYPE_SPECIAL},
- {"del_requests", NSS_STATS_TYPE_SPECIAL},
- {"update_requests", NSS_STATS_TYPE_SPECIAL},
- {"mda_updations", NSS_STATS_TYPE_SPECIAL},
- {"flag_updations", NSS_STATS_TYPE_SPECIAL}
+ {"alloc_failures", NSS_STATS_TYPE_SPECIAL},
+ {"entry_exist_failures", NSS_STATS_TYPE_SPECIAL},
+ {"add_success", NSS_STATS_TYPE_SPECIAL},
+ {"table_full_errors", NSS_STATS_TYPE_SPECIAL},
+ {"insert_failures", NSS_STATS_TYPE_SPECIAL},
+ {"not_found", NSS_STATS_TYPE_SPECIAL},
+ {"unhashed_errors", NSS_STATS_TYPE_SPECIAL},
+ {"delete_failures", NSS_STATS_TYPE_SPECIAL},
+ {"delete_success", NSS_STATS_TYPE_SPECIAL},
+ {"update_success", NSS_STATS_TYPE_SPECIAL},
+ {"lookup_success", NSS_STATS_TYPE_SPECIAL},
+ {"add_requests", NSS_STATS_TYPE_SPECIAL},
+ {"del_requests", NSS_STATS_TYPE_SPECIAL},
+ {"update_requests", NSS_STATS_TYPE_SPECIAL},
+ {"mda_updations", NSS_STATS_TYPE_SPECIAL},
+ {"flag_updations", NSS_STATS_TYPE_SPECIAL},
};
/*
--- a/nss_wifi_stats.c
+++ b/nss_wifi_stats.c
@@ -1,6 +1,6 @@
@ -2254,12 +2104,3 @@
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -86,7 +86,7 @@ struct nss_stats_info nss_wifi_stats_str
{"rx_htt_fetch_cnt" , NSS_STATS_TYPE_SPECIAL},
{"total_tidq_bypass_cnt" , NSS_STATS_TYPE_SPECIAL},
{"global_q_full_cnt" , NSS_STATS_TYPE_SPECIAL},
- {"tidq_full_cnt" , NSS_STATS_TYPE_SPECIAL}
+ {"tidq_full_cnt" , NSS_STATS_TYPE_SPECIAL},
};
uint64_t nss_wifi_stats[NSS_MAX_WIFI_RADIO_INTERFACES][NSS_WIFI_STATS_MAX]; /* WIFI statistics */

View File

@ -0,0 +1,150 @@
--- a/exports/nss_wifi_mesh.h
+++ b/exports/nss_wifi_mesh.h
@@ -386,27 +386,27 @@ struct nss_wifi_mesh_path_expiry_msg {
* Encapsulation statistics.
*/
struct nss_wifi_mesh_encap_stats {
- uint32_t expiry_notify_sent; /* Number of times expiry notification sent to host. */
- uint32_t mc_count; /* Number of multicast packets. */
- uint32_t mp_not_found; /* Number of times mesh path is not found. */
- uint32_t mp_active; /* Number of times mesh path is active. */
- uint32_t mpp_not_found; /* Number of times proxy path is not found. */
- uint32_t mpp_found; /* Number of times proxy path is found. */
- uint32_t encap_hdr_fail; /* Number of times encapsulating mesh header failed. */
- uint32_t mp_del_notify_fail; /* Number of times notifying mesh path delete failed. */
- uint32_t link_enqueue; /* Number of packets enqueued to the link VAP. */
- uint32_t link_enq_fail; /* Number of times enqueue to link vap failed. */
- uint32_t ra_lup_fail; /* Number of times receiver address look up is failed. */
- uint32_t dummy_add_count; /* Number of times dummy path is added. */
- uint32_t encap_mp_add_notify_fail; /* Number of times add notification failed. */
- uint32_t dummy_add_fail; /* Number of times dummy addition failed. */
- uint32_t dummy_lup_fail; /* Number of times dummy lookup failed. */
- uint32_t send_to_host_failed; /* Number of packets failed to be sent to host. */
- uint32_t sent_to_host; /* Number of packets sent to host. */
- uint32_t expiry_notify_fail; /* Number of times expiry notification to host failed. */
- uint32_t no_headroom; /* Number of packets dropped because there is no headroom. */
- uint32_t path_refresh_sent; /* Number of times path refresh is sent to host. */
- uint32_t linearise_failed; /* Number of packets dropped because pb_linearise. */
+ uint32_t expiry_notify_sent; /**< Number of times expiry notification sent to host. */
+ uint32_t mc_count; /**< Number of multicast packets. */
+ uint32_t mp_not_found; /**< Number of times mesh path is not found. */
+ uint32_t mp_active; /**< Number of times mesh path is active. */
+ uint32_t mpp_not_found; /**< Number of times proxy path is not found. */
+ uint32_t mpp_found; /**< Number of times proxy path is found. */
+ uint32_t encap_hdr_fail; /**< Number of times encapsulating mesh header failed. */
+ uint32_t mp_del_notify_fail; /**< Number of times notifying mesh path delete failed. */
+ uint32_t link_enqueue; /**< Number of packets enqueued to the link VAP. */
+ uint32_t link_enq_fail; /**< Number of times enqueue to link vap failed. */
+ uint32_t ra_lup_fail; /**< Number of times receiver address look up is failed. */
+ uint32_t dummy_add_count; /**< Number of times dummy path is added. */
+ uint32_t encap_mp_add_notify_fail; /**< Number of times add notification failed. */
+ uint32_t dummy_add_fail; /**< Number of times dummy addition failed. */
+ uint32_t dummy_lup_fail; /**< Number of times dummy lookup failed. */
+ uint32_t send_to_host_failed; /**< Number of packets failed to be sent to host. */
+ uint32_t sent_to_host; /**< Number of packets sent to host. */
+ uint32_t expiry_notify_fail; /**< Number of times expiry notification to host failed. */
+ uint32_t no_headroom; /**< Number of packets dropped because there is no headroom. */
+ uint32_t path_refresh_sent; /**< Number of times path refresh is sent to host. */
+ uint32_t linearise_failed; /**< Number of packets dropped because pb_linearise. */
};
/*
--- a/nss_wifi_mesh_strings.c
+++ b/nss_wifi_mesh_strings.c
@@ -106,22 +106,22 @@ static ssize_t nss_wifi_mesh_path_stats_
* Wi-Fi mesh proxy path statistics string.
*/
struct nss_stats_info nss_wifi_mesh_strings_proxy_path_stats[NSS_WIFI_MESH_PROXY_PATH_STATS_TYPE_MAX] = {
- {"alloc_failures", NSS_STATS_TYPE_SPECIAL},
- {"entry_exist_failures", NSS_STATS_TYPE_SPECIAL},
- {"add_success", NSS_STATS_TYPE_SPECIAL},
- {"table_full_errors", NSS_STATS_TYPE_SPECIAL},
- {"insert_failures", NSS_STATS_TYPE_SPECIAL},
- {"not_found", NSS_STATS_TYPE_SPECIAL},
- {"unhashed_errors", NSS_STATS_TYPE_SPECIAL},
- {"delete_failures", NSS_STATS_TYPE_SPECIAL},
- {"delete_success", NSS_STATS_TYPE_SPECIAL},
- {"update_success", NSS_STATS_TYPE_SPECIAL},
- {"lookup_success", NSS_STATS_TYPE_SPECIAL},
- {"add_requests", NSS_STATS_TYPE_SPECIAL},
- {"del_requests", NSS_STATS_TYPE_SPECIAL},
- {"update_requests", NSS_STATS_TYPE_SPECIAL},
- {"mda_updations", NSS_STATS_TYPE_SPECIAL},
- {"flag_updations", NSS_STATS_TYPE_SPECIAL}
+ {"alloc_failures", NSS_STATS_TYPE_SPECIAL},
+ {"entry_exist_failures", NSS_STATS_TYPE_SPECIAL},
+ {"add_success", NSS_STATS_TYPE_SPECIAL},
+ {"table_full_errors", NSS_STATS_TYPE_SPECIAL},
+ {"insert_failures", NSS_STATS_TYPE_SPECIAL},
+ {"not_found", NSS_STATS_TYPE_SPECIAL},
+ {"unhashed_errors", NSS_STATS_TYPE_SPECIAL},
+ {"delete_failures", NSS_STATS_TYPE_SPECIAL},
+ {"delete_success", NSS_STATS_TYPE_SPECIAL},
+ {"update_success", NSS_STATS_TYPE_SPECIAL},
+ {"lookup_success", NSS_STATS_TYPE_SPECIAL},
+ {"add_requests", NSS_STATS_TYPE_SPECIAL},
+ {"del_requests", NSS_STATS_TYPE_SPECIAL},
+ {"update_requests", NSS_STATS_TYPE_SPECIAL},
+ {"mda_updations", NSS_STATS_TYPE_SPECIAL},
+ {"flag_updations", NSS_STATS_TYPE_SPECIAL}
};
/*
--- a/exports/nss_wifi.h
+++ b/exports/nss_wifi.h
@@ -641,8 +641,8 @@ struct nss_wifi_stats_sync_msg {
* Information for creating a Wi-Fi peer freelist.
*/
struct nss_wifi_peer_freelist_append_msg {
- uint32_t addr; /**< Starting address of peer freelist pool. */
- uint32_t length; /**< Size of peer freelist pool. */
+ uint32_t addr; /**< Starting address of the peer freelist pool. */
+ uint32_t length; /**< Size of the peer freelist pool. */
uint32_t num_peers; /**< Maximum peer entries supported in the pool. */
};
@@ -709,7 +709,7 @@ struct nss_wifi_peer_ol_stats {
uint32_t tx_mcast; /**< Number of multicast packets sent. */
uint32_t tx_ucast; /**< Number of unicast packets sent. */
uint32_t tx_data; /**< Number data packets sent. */
- uint32_t tx_bytes; /**< Number of bytes sent. */
+ uint32_t tx_bytes; /**< Number of bytes transmitted. */
uint32_t tx_fail; /**< Number of failed Tx packets. */
uint32_t thrup_bytes; /**< Number of throughput bytes. */
uint32_t tx_bcast_pkts; /**< Number of broadcast packets sent. */
@@ -742,7 +742,7 @@ struct nss_wifi_ol_stats_msg {
/**
* nss_wifi_sta_kickout_msg
- * Station kickout message from NSS Firmware
+ * Station kickout message from NSS firmware.
*/
struct nss_wifi_sta_kickout_msg {
uint32_t peer_id; /**< Peer ID. */
@@ -759,7 +759,7 @@ struct nss_wifi_peer_isolation_msg {
/**
* nss_wifi_wnm_peer_rx_activity_msg
- * Rx active state information for the peer.
+ * Receive active state information for the peer.
*/
struct nss_wifi_wnm_peer_rx_activity_msg {
uint16_t nentries; /**< Number of entries. */
@@ -917,7 +917,7 @@ struct nss_wifi_msg {
struct nss_wifi_cmd_msg wcmdm;
/**< Pdev command information. */
struct nss_wifi_enable_ol_statsv2 wesh_msg;
- /**< Enable version 2 tx/rx stats. */
+ /**< Enable version 2 transmit/receive statistics. */
struct nss_wifi_ol_peer_time_msg wopt_msg;
/**< Send per peer/TID timestamp statistics to host. */
struct nss_wifi_peer_isolation_msg isolation_msg;
@@ -927,7 +927,7 @@ struct nss_wifi_msg {
/**
* nss_wifi_get_context
- * Gets the Wi-Fi context used in nss_gre_tx.
+ * Gets the Wi-Fi context used in NSS GRE transmit.
*
* @return
* Pointer to the NSS core context.