Merge "qca-nss-drv: Increase the maximum allowed pbuf pool size to 10MB from 8MB"
diff --git a/exports/nss_ppe.h b/exports/nss_ppe.h
index 126d8fa..d30fe46 100644
--- a/exports/nss_ppe.h
+++ b/exports/nss_ppe.h
@@ -35,6 +35,25 @@
#define NSS_PPE_PORT_IPSEC 7
/**< Port number of PPE inline IPsec port. */
+/**
+ * nss_ppe_sc_type
+ * PPE service code types.
+ */
+enum nss_ppe_sc_type {
+ NSS_PPE_SC_NONE, /**< Normal PPE processing. */
+ NSS_PPE_SC_BYPASS_ALL, /**< Bypasses all stages in PPE. */
+ NSS_PPE_SC_ADV_QOS_BRIDGED, /**< Advance QoS redirection for bridged flow. */
+ NSS_PPE_SC_BR_QOS, /**< Bridge QoS redirection. */
+ NSS_PPE_SC_BNC_0, /**< QoS bounce. */
+ NSS_PPE_SC_BNC_CMPL_0, /**< QoS bounce complete. */
+ NSS_PPE_SC_ADV_QOS_ROUTED, /**< Advance QoS redirection for routed flow. */
+ NSS_PPE_SC_IPSEC_PPE2EIP, /**< Inline IPsec redirection from PPE-to-EIP. */
+ NSS_PPE_SC_IPSEC_EIP2PPE, /**< Inline IPsec redirection from EIP-to-PPE. */
+ NSS_PPE_SC_PTP, /**< Service code for PTP packets. */
+ NSS_PPE_SC_VLAN_FILTER_BYPASS, /**< VLAN filter bypass for bridge flows between 2 different VSIs. */
+ NSS_PPE_SC_MAX, /**< Maximum service code. */
+};
+
/** @} */ /* end_addtogroup nss_ppe_subsystem */
#endif /* _NSS_PPE_H_ */
diff --git a/exports/nss_wifi_vdev.h b/exports/nss_wifi_vdev.h
index d7d5344..27ada78 100644
--- a/exports/nss_wifi_vdev.h
+++ b/exports/nss_wifi_vdev.h
@@ -600,7 +600,8 @@
enum wifi_vdev_ext_wds_info_type {
NSS_WIFI_VDEV_WDS_TYPE_NONE = 0,
NSS_WIFI_VDEV_WDS_TYPE_RX, /**< Rx WDS entry. */
- NSS_WIFI_VDEV_WDS_TYPE_MEC /**< Multicast Tx WDS entry. */
+ NSS_WIFI_VDEV_WDS_TYPE_MEC, /**< Multicast Tx WDS entry. */
+ NSS_WIFI_VDEV_WDS_TYPE_DA /**< Rx WDS entry for destination address. */
};
/**
diff --git a/exports/nss_wifili_if.h b/exports/nss_wifili_if.h
index 757783e..529310b 100644
--- a/exports/nss_wifili_if.h
+++ b/exports/nss_wifili_if.h
@@ -66,6 +66,8 @@
/**< Metadata area total size. */
#define NSS_WIFILI_MEC_PEER_ID 0xDEAD
/**< MEC (Multicast echo check) peer ID. */
+#define NSS_WIFILI_DA_PEER_ID 0xDAAD
+ /**< Destination address peer ID. */
#define NSS_WIFILI_MIC_KEY_LEN 8
/**< MIC (Message integrity code) key length. */
#define NSS_WIFILI_TQM_RR_MAX 7
@@ -138,6 +140,8 @@
NSS_WIFILI_RADIO_BUF_CFG,
NSS_WIFILI_DBDC_REPEATER_SET_MSG,
NSS_DBDC_REPEATER_AST_FLUSH_MSG,
+ NSS_WIFILI_SET_HMMC_DSCP_OVERRIDE_MSG,
+ NSS_WIFILI_SET_HMMC_DSCP_TID_MSG,
NSS_WIFILI_MAX_MSG
};
@@ -907,6 +911,24 @@
};
/**
+ * nss_wifili_hmmc_dscp_tid_set_msg
+ * Wifili Hy-Fi managed multicast DSCP TID set message.
+ */
+struct nss_wifili_hmmc_dscp_tid_set_msg {
+ uint16_t radio_id; /**< Radio ID. */
+ uint16_t value; /**< Hy-Fi managed multicast TID value. */
+};
+
+/**
+ * nss_wifili_hmmc_dscp_override_set_msg
+ * Wifili Hy-Fi managed multicast DSCP override set message.
+ */
+struct nss_wifili_hmmc_dscp_override_set_msg {
+ uint16_t radio_id; /**< Radio ID. */
+ uint16_t value; /**< Hy-Fi managed multicast DSCP override value. */
+};
+
+/**
* nss_wifili_reo_tidq_msg
* REO TID queue setup message.
*/
@@ -1008,6 +1030,10 @@
/**< Wifili peer enable NAWDS message. */
struct nss_wifili_dbdc_repeater_set_msg dbdcrptrmsg;
/**< Wifili DBDC repeater enable message. */
+ struct nss_wifili_hmmc_dscp_override_set_msg shmmcdscpmsg;
+ /**< Wifili Hy-Fi managed multicast DSCP override set message. */
+ struct nss_wifili_hmmc_dscp_tid_set_msg shmmcdcptidmsg;
+ /**< Wifili Hy-Fi managed multicast DSCP TID map set message. */
} msg; /**< Message payload. */
};
diff --git a/nss_ppe.h b/nss_ppe.h
index 542cc47..67aab8f 100644
--- a/nss_ppe.h
+++ b/nss_ppe.h
@@ -131,24 +131,6 @@
};
/**
- * nss_ppe_sc_type
- * PPE service code types
- */
-enum nss_ppe_sc_type {
- NSS_PPE_SC_NONE, /* Normal PPE processing */
- NSS_PPE_SC_BYPASS_ALL, /* Bypasses all stages in PPE */
- NSS_PPE_SC_ADV_QOS_BRIDGED, /* Adv QoS redirection for bridged flow */
- NSS_PPE_SC_BR_QOS, /* Bridge QoS redirection */
- NSS_PPE_SC_BNC_0, /* QoS bounce */
- NSS_PPE_SC_BNC_CMPL_0, /* QoS bounce complete */
- NSS_PPE_SC_ADV_QOS_ROUTED, /* Adv QoS redirection for routed flow */
- NSS_PPE_SC_IPSEC_PPE2EIP, /* Inline IPsec redirection from PPE TO EIP */
- NSS_PPE_SC_IPSEC_EIP2PPE, /* Inline IPsec redirection from EIP to PPE */
- NSS_PPE_SC_VLAN_FILTER_BYPASS, /* VLAN filter bypass for bridge flows between 2 different VSIs */
- NSS_PPE_SC_MAX, /* Max service code */
-};
-
-/**
* nss_ppe_stats_sc
* Message structure for per service code stats.
*/
diff --git a/nss_ppe_stats.c b/nss_ppe_stats.c
index 5d34d36..f35183d 100644
--- a/nss_ppe_stats.c
+++ b/nss_ppe_stats.c
@@ -475,6 +475,8 @@
"SC_ADV_QOS_ROUTED ",
"SC_IPSEC_PPE2EIP ",
"SC_IPSEC_EIP2PPE ",
+ "SC_PTP ",
+ "SC_VLAN_FILTER ",
};
/*