diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h
index 191487a3c815..5991426a5459 100644
--- a/fw/wmi_tlv_defs.h
+++ b/fw/wmi_tlv_defs.h
@@ -1077,6 +1077,7 @@ typedef enum {
     WMITLV_TAG_STRUC_wmi_pdev_non_srg_obss_bssid_enable_bitmap_cmd_fixed_param,
     WMITLV_TAG_STRUC_wmi_roam_capability_report_event_fixed_param,
     WMITLV_TAG_STRUC_wmi_pmf_bcn_protect_stats,
+    WMITLV_TAG_STRUC_wmi_nan_capabilities,
 } WMITLV_TAG_ID;
 
 /*
@@ -4459,7 +4460,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID);
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_DMA_RING_CAPABILITIES, dma_ring_caps, WMITLV_SIZE_VAR) \
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_spectral_bin_scaling_params, wmi_bin_scaling_params, WMITLV_SIZE_VAR) \
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_MAC_PHY_CAPABILITIES_EXT, mac_phy_caps, WMITLV_SIZE_VAR) \
-    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_HAL_REG_CAPABILITIES_EXT2, hal_reg_caps, WMITLV_SIZE_VAR)
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_HAL_REG_CAPABILITIES_EXT2, hal_reg_caps, WMITLV_SIZE_VAR) \
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_nan_capabilities, wmi_nan_capabilities, nan_cap, WMITLV_SIZE_FIX)
 WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT2_EVENTID);
 
 #define WMITLV_TABLE_WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID(id,op,buf,len) \
diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index d83f78c47551..042afcf68061 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -3651,6 +3651,13 @@ typedef struct {
      * for any EMA VAP on any pdev.
      */
     A_UINT32 ema_max_profile_period;
+    /** @brief max_ndp_sessions
+     * This is the max ndp sessions sent by the host which is the minimum
+     * of the value requested within the host's ini configurations and
+     * the max ndp sessions supported by the firmware (as reported in the
+     * SERVICE_READY_EXT2_EVENT message).
+     */
+    A_UINT32 max_ndp_sessions;
 } wmi_resource_config;
 
 #define WMI_MSDU_FLOW_AST_ENABLE_GET(msdu_flow_config0, ast_x) \
@@ -19022,6 +19029,13 @@ typedef struct {
      */
 } wmi_nan_dmesg_event_fixed_param;
 
+typedef struct {
+    /** TLV tag and len; tag equals WMITLV_TAG_STRUCT_wmi_nan_capabilities */
+    A_UINT32 tlv_header;
+    /** Maximum number of ndp sessions supported by the Firmware */
+    A_UINT32 max_ndp_sessions;
+} wmi_nan_capabilities;
+
 /** NAN DATA CMD's */
 
 /**
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index 2de031bbbf66..770cb0fc3e62 100644
--- a/fw/wmi_version.h
+++ b/fw/wmi_version.h
@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility. */
-#define __WMI_REVISION_ 839
+#define __WMI_REVISION_ 840
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work