diff --git a/inc/saiacl.h b/inc/saiacl.h index 6985a9b5f..f2f40bce2 100644 --- a/inc/saiacl.h +++ b/inc/saiacl.h @@ -166,12 +166,6 @@ typedef enum _sai_acl_action_type_t /** Set Packet Outer Vlan Priority */ SAI_ACL_ACTION_TYPE_SET_OUTER_VLAN_PRI, - /** Add Packet Vlan Id */ - SAI_ACL_ACTION_TYPE_ADD_VLAN_ID, - - /** Add Packet Vlan Priority */ - SAI_ACL_ACTION_TYPE_ADD_VLAN_PRI, - /** Set Packet Src MAC Address */ SAI_ACL_ACTION_TYPE_SET_SRC_MAC, @@ -265,6 +259,12 @@ typedef enum _sai_acl_action_type_t /** Bind a MACsec flow object */ SAI_ACL_ACTION_TYPE_MACSEC_FLOW, + /** Add Packet Vlan Id */ + SAI_ACL_ACTION_TYPE_ADD_VLAN_ID, + + /** Add Packet Vlan Priority */ + SAI_ACL_ACTION_TYPE_ADD_VLAN_PRI, + /** Set custom LAG hash object ID */ SAI_ACL_ACTION_TYPE_SET_LAG_HASH_ID, @@ -543,42 +543,6 @@ typedef enum _sai_acl_table_attr_t */ SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6 = SAI_ACL_TABLE_ATTR_FIELD_START, - /** - * @brief Src IPv6 Address 127:96 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD3, - - /** - * @brief Src IPv6 Address 95:64 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD2, - - /** - * @brief Src IPv6 Address 63:32 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD1, - - /** - * @brief Src IPv6 Address 31:0 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD0, - /** * @brief Dst IPv6 Address * @@ -588,42 +552,6 @@ typedef enum _sai_acl_table_attr_t */ SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6, - /** - * @brief Dst IPv6 Address 127:96 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3, - - /** - * @brief Dst IPv6 Address 95:64 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2, - - /** - * @brief Dst IPv6 Address 63:32 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD1, - - /** - * @brief Dst IPv6 Address 31:0 32 bits - * - * @type bool - * @flags CREATE_ONLY - * @default false - */ - SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD0, - /** * @brief Inner Src IPv6 Address * @@ -1385,10 +1313,83 @@ typedef enum _sai_acl_table_attr_t */ SAI_ACL_TABLE_ATTR_FIELD_TAM_INT_TYPE, + /** + * @brief Src IPv6 Address 127:96 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD3, + + /** + * @brief Src IPv6 Address 95:64 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD2, + + /** + * @brief Src IPv6 Address 63:32 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD1, + + /** + * @brief Src IPv6 Address 31:0 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD0, + + + /** + * @brief Dst IPv6 Address 127:96 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3, + + /** + * @brief Dst IPv6 Address 95:64 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2, + + /** + * @brief Dst IPv6 Address 63:32 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD1, + + /** + * @brief Dst IPv6 Address 31:0 32 bits + * + * @type bool + * @flags CREATE_ONLY + * @default false + */ + SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD0, + /** * @brief End of ACL Table Match Field */ - SAI_ACL_TABLE_ATTR_FIELD_END = SAI_ACL_TABLE_ATTR_FIELD_TAM_INT_TYPE, + SAI_ACL_TABLE_ATTR_FIELD_END = SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD0, /** * @brief ACL table entries associated with this table. @@ -1499,42 +1500,6 @@ typedef enum _sai_acl_entry_attr_t */ SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6 = SAI_ACL_ENTRY_ATTR_FIELD_START, - /** - * @brief Src IPv6 Address 127:96 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD3, - - /** - * @brief Src IPv6 Address 95:64 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD2, - - /** - * @brief Src IPv6 Address 63:32 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD1, - - /** - * @brief Src IPv6 Address 31:0 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD0, - /** * @brief Dst IPv6 Address * @@ -1544,42 +1509,6 @@ typedef enum _sai_acl_entry_attr_t */ SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6, - /** - * @brief Dst IPv6 Address 127:96 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD3, - - /** - * @brief Dst IPv6 Address 95:64 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD2, - - /** - * @brief Dst IPv6 Address 63:32 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD1, - - /** - * @brief Dst IPv6 Address 31:0 32 bits - * - * @type sai_acl_field_data_t sai_ip6_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD0, - /** * @brief Inner Src IPv6 Address * @@ -2372,6 +2301,78 @@ typedef enum _sai_acl_entry_attr_t */ SAI_ACL_ENTRY_ATTR_FIELD_TAM_INT_TYPE, + /** + * @brief Src IPv6 Address 127:96 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD3, + + /** + * @brief Src IPv6 Address 95:64 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD2, + + /** + * @brief Src IPv6 Address 63:32 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD1, + + /** + * @brief Src IPv6 Address 31:0 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_SRC_IPV6_WORD0, + + /** + * @brief Dst IPv6 Address 127:96 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD3, + + /** + * @brief Dst IPv6 Address 95:64 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD2, + + /** + * @brief Dst IPv6 Address 63:32 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD1, + + /** + * @brief Dst IPv6 Address 31:0 32 bits + * + * @type sai_acl_field_data_t sai_ip6_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_FIELD_DST_IPV6_WORD0, + /** * @brief End of Rule Match Fields */ @@ -2553,25 +2554,6 @@ typedef enum _sai_acl_entry_attr_t */ SAI_ACL_ENTRY_ATTR_ACTION_SET_OUTER_VLAN_PRI, - /** - * @brief Add Packet Vlan Id (12 bits) - * - * @type sai_acl_action_data_t sai_uint16_t - * @flags CREATE_AND_SET - * @isvlan true - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_ACTION_ADD_VLAN_ID, - - /** - * @brief Add Packet Vlan Priority (3 bits) - * - * @type sai_acl_action_data_t sai_uint8_t - * @flags CREATE_AND_SET - * @default disabled - */ - SAI_ACL_ENTRY_ATTR_ACTION_ADD_VLAN_PRI, - /** * @brief Set Packet Src MAC Address * @@ -2892,6 +2874,25 @@ typedef enum _sai_acl_entry_attr_t */ SAI_ACL_ENTRY_ATTR_ACTION_MACSEC_FLOW, + /** + * @brief Add Packet Vlan Id (12 bits) + * + * @type sai_acl_action_data_t sai_uint16_t + * @flags CREATE_AND_SET + * @isvlan true + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_ACTION_ADD_VLAN_ID, + + /** + * @brief Add Packet Vlan Priority (3 bits) + * + * @type sai_acl_action_data_t sai_uint8_t + * @flags CREATE_AND_SET + * @default disabled + */ + SAI_ACL_ENTRY_ATTR_ACTION_ADD_VLAN_PRI, + /** * @brief LAG Hash ID * diff --git a/inc/saihash.h b/inc/saihash.h index a6310a27c..b1b272107 100644 --- a/inc/saihash.h +++ b/inc/saihash.h @@ -62,50 +62,6 @@ typedef enum _sai_native_hash_field_t /** Native hash field inner destination IP */ SAI_NATIVE_HASH_FIELD_INNER_DST_IP, - /** - * @brief Native hash field source IPv4. - * - * Also, refers to the outer source IPv4 - * in case for encapsulated packets - */ - SAI_NATIVE_HASH_FIELD_SRC_IPV4, - - /** - * @brief Native hash field destination IPv4 - * - * Also, refers to the outer source IPv4 - * in case for encapsulated packets - */ - SAI_NATIVE_HASH_FIELD_DST_IPV4, - - /** - * @brief Native hash field source IPv6. - * - * Also, refers to the outer source IPv6 - * in case for encapsulated packets - */ - SAI_NATIVE_HASH_FIELD_SRC_IPV6, - - /** - * @brief Native hash field destination IPv6 - * - * Also, refers to the outer source IPv6 - * in case for encapsulated packets - */ - SAI_NATIVE_HASH_FIELD_DST_IPV6, - - /** Native hash field inner source IPv4 */ - SAI_NATIVE_HASH_FIELD_INNER_SRC_IPV4, - - /** Native hash field inner destination IPv4 */ - SAI_NATIVE_HASH_FIELD_INNER_DST_IPV4, - - /** Native hash field inner source IPv6 */ - SAI_NATIVE_HASH_FIELD_INNER_SRC_IPV6, - - /** Native hash field inner destination IPv6 */ - SAI_NATIVE_HASH_FIELD_INNER_DST_IPV6, - /** Native hash field vlan id */ SAI_NATIVE_HASH_FIELD_VLAN_ID, @@ -169,6 +125,50 @@ typedef enum _sai_native_hash_field_t /** Native hash field IPv6 flow label */ SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL, + /** + * @brief Native hash field source IPv4. + * + * Also, refers to the outer source IPv4 + * in case for encapsulated packets + */ + SAI_NATIVE_HASH_FIELD_SRC_IPV4, + + /** + * @brief Native hash field destination IPv4 + * + * Also, refers to the outer source IPv4 + * in case for encapsulated packets + */ + SAI_NATIVE_HASH_FIELD_DST_IPV4, + + /** + * @brief Native hash field source IPv6. + * + * Also, refers to the outer source IPv6 + * in case for encapsulated packets + */ + SAI_NATIVE_HASH_FIELD_SRC_IPV6, + + /** + * @brief Native hash field destination IPv6 + * + * Also, refers to the outer source IPv6 + * in case for encapsulated packets + */ + SAI_NATIVE_HASH_FIELD_DST_IPV6, + + /** Native hash field inner source IPv4 */ + SAI_NATIVE_HASH_FIELD_INNER_SRC_IPV4, + + /** Native hash field inner destination IPv4 */ + SAI_NATIVE_HASH_FIELD_INNER_DST_IPV4, + + /** Native hash field inner source IPv6 */ + SAI_NATIVE_HASH_FIELD_INNER_SRC_IPV6, + + /** Native hash field inner destination IPv6 */ + SAI_NATIVE_HASH_FIELD_INNER_DST_IPV6, + /** No field - for compatibility, must be last */ SAI_NATIVE_HASH_FIELD_NONE,