Merge "[qca-nss-drv] Modified Doxygen comments."
diff --git a/exports/arch/nss_fsm9010.h b/exports/arch/nss_fsm9010.h
index dcddc63..f5cadbf 100644
--- a/exports/arch/nss_fsm9010.h
+++ b/exports/arch/nss_fsm9010.h
@@ -22,12 +22,12 @@
 #define __NSS_FSM9010_H
 
 /**
- * @addtogroup nss_fsm9010_subsystem
+ * @addtogroup nss_arch_macros
  * @{
  */
 
-#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS. */
-#define NSS_HOST_CORES 4		/**< Number of host cores. */
+#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS for the FSM9010 chipset. */
+#define NSS_HOST_CORES 4		/**< Number of host cores for the FSM9010 chipset. */
 
 /**
  * @}
diff --git a/exports/arch/nss_ipq40xx.h b/exports/arch/nss_ipq40xx.h
index e96f15a..dc84984 100644
--- a/exports/arch/nss_ipq40xx.h
+++ b/exports/arch/nss_ipq40xx.h
@@ -22,12 +22,12 @@
 #define __NSS_IPQ40XX_H
 
 /**
- * @addtogroup nss_ipq40xx_subsystem
+ * @addtogroup nss_arch_macros
  * @{
  */
 
-#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS. */
-#define NSS_HOST_CORES 4		/**< Number of host cores. */
+#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS for the IPQ40xx chipsets. */
+#define NSS_HOST_CORES 4		/**< Number of host cores for the IPQ40xx chipsets. */
 
 /**
  * @}
diff --git a/exports/arch/nss_ipq806x.h b/exports/arch/nss_ipq806x.h
index ffcd4da..b8f4d05 100644
--- a/exports/arch/nss_ipq806x.h
+++ b/exports/arch/nss_ipq806x.h
@@ -22,12 +22,12 @@
 #define __NSS_IPQ806X_H
 
 /**
- * @addtogroup nss_ipq806x_subsystem
+ * @addtogroup nss_arch_macros
  * @{
  */
 
-#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS. */
-#define NSS_HOST_CORES 2		/**< Number of host cores. */
+#define NSS_MAX_NUM_PRI 1		/**< Maximum number of priority queues in NSS for the IPQ806x chipsets. */
+#define NSS_HOST_CORES 2		/**< Number of host cores for the IPQ806x chipsets. */
 
 /**
  * @}
diff --git a/exports/arch/nss_ipq807x.h b/exports/arch/nss_ipq807x.h
index e910658..05122bc 100644
--- a/exports/arch/nss_ipq807x.h
+++ b/exports/arch/nss_ipq807x.h
@@ -22,12 +22,12 @@
 #define __NSS_IPQ807X_H
 
 /**
- * @addtogroup nss_ipq807x_subsystem
+ * @addtogroup nss_arch_macros
  * @{
  */
 
-#define NSS_MAX_NUM_PRI 4		/**< Maximum number of priority queues in NSS. */
-#define NSS_HOST_CORES 4		/**< Number of host cores. */
+#define NSS_MAX_NUM_PRI 4		/**< Maximum number of priority queues in NSS for the IPQ807x chipsets. */
+#define NSS_HOST_CORES 4		/**< Number of host cores for the IPQ807x chipsets. */
 
 /**
  * @}
diff --git a/exports/arch/nss_ipq807x_64.h b/exports/arch/nss_ipq807x_64.h
index f75f2fe..ca6d07f 100644
--- a/exports/arch/nss_ipq807x_64.h
+++ b/exports/arch/nss_ipq807x_64.h
@@ -22,12 +22,12 @@
 #define __NSS_IPQ807x_64_H
 
 /**
- * @addtogroup nss_ipq807x_subsystem
+ * @addtogroup nss_arch_macros
  * @{
  */
 
-#define NSS_MAX_NUM_PRI 4		/**< Maximum number of priority queues in NSS. */
-#define NSS_HOST_CORES 4		/**< Number of host cores. */
+#define NSS_MAX_NUM_PRI 4		/**< Maximum number of priority queues in NSS for the IPQ807x 64-bit chipsets. */
+#define NSS_HOST_CORES 4		/**< Number of host cores for the IPQ807x 64-bit chipsets. */
 
 /**
  * @}
diff --git a/exports/nss_dtls_cmn.h b/exports/nss_dtls_cmn.h
index 640f487..7571bb9 100644
--- a/exports/nss_dtls_cmn.h
+++ b/exports/nss_dtls_cmn.h
@@ -285,12 +285,13 @@
  * nss_dtls_cmn_data_callback_t \n
  * nss_dtls_cmn_msg_callback_t
  *
- * @param[in] if_num        NSS interface number.
- * @param[in] data_cb       Callback function for the message.
- * @param[in] msg_cb        Callback for DTLS tunnel message.
- * @param[in] netdev        Pointer to the associated network device.
- * @param[in] features      Data socket buffer types supported by this interface.
- * @param[in] app_ctx       Pointer to the application context.
+ * @param[in] if_num    NSS interface number.
+ * @param[in] data_cb   Callback function for the message.
+ * @param[in] msg_cb    Callback for DTLS tunnel message.
+ * @param[in] netdev    Pointer to the associated network device.
+ * @param[in] features  Data socket buffer types supported by this interface.
+ * @param[in] type      Type of message.
+ * @param[in] app_ctx   Pointer to the application context.
  *
  * @return
  * Pointer to the NSS core context.
@@ -321,9 +322,9 @@
  * nss_dtls_cmn_notify_register
  *	Register an event callback to handle notification from DTLS firmware package.
  *
- * @param[in] if_num     NSS interface number.
- * @param[in] ev_cb      Callback for DTLS tunnel message.
- * @param[in] app_data   Pointer to the application context.
+ * @param[in] ifnum     NSS interface number.
+ * @param[in] ev_cb     Callback for DTLS tunnel message.
+ * @param[in] app_data  Pointer to the application context.
  *
  * @return
  * Pointer to NSS core context.
@@ -335,7 +336,7 @@
  * nss_dtls_cmn_notify_unregister
  *	Unregister an event callback.
  *
- * @param[in] if_num      NSS interface number.
+ * @param[in] ifnum  NSS interface number.
  *
  * @return
  * None.
diff --git a/exports/nss_tunipip6.h b/exports/nss_tunipip6.h
index 6755055..3c19c4b 100644
--- a/exports/nss_tunipip6.h
+++ b/exports/nss_tunipip6.h
@@ -27,7 +27,7 @@
  * @{
  */
 
-#define NSS_TUNIPIP6_MAX_FMR_NUMBER 4
+#define NSS_TUNIPIP6_MAX_FMR_NUMBER 4	/**< Maximum number of forward mapping rule (FMR). */
 
 /**
  * nss_tunipip6_fmr