Remove unnecessary change related to ECN and VxLan udp souce port in PR

opencomputeproject#1452，only leave TC map Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
richardyu-ms · Apr 11, 2022 · a47289d · a47289d
1 parent eab32e3
commit a47289d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 130 deletions.
diff --git a/inc/saiswitch.h b/inc/saiswitch.h
@@ -357,82 +357,6 @@ typedef enum _sai_switch_tunnel_attr_t
      */
     SAI_SWITCH_TUNNEL_ATTR_LOOPBACK_PACKET_ACTION,
 
-    /* Tunnel encap attributes */
-
-    /**
-     * @brief Tunnel encap ECN mode
-     *
-     * @type sai_tunnel_encap_ecn_mode_t
-     * @flags CREATE_ONLY
-     * @default SAI_TUNNEL_ENCAP_ECN_MODE_STANDARD
-     */
-    SAI_SWITCH_TUNNEL_ATTR_TUNNEL_ENCAP_ECN_MODE,
-
-    /**
-     * @brief Tunnel encap ECN mappers only
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_ONLY
-     * @objects SAI_OBJECT_TYPE_TUNNEL_MAP
-     * @default empty
-     */
-    SAI_SWITCH_TUNNEL_ATTR_ENCAP_MAPPERS,
-
-    /* Tunnel decap attributes */
-
-    /**
-     * @brief Tunnel decap ECN mode
-     *
-     * @type sai_tunnel_decap_ecn_mode_t
-     * @flags CREATE_ONLY
-     * @default SAI_TUNNEL_DECAP_ECN_MODE_STANDARD
-     */
-    SAI_SWITCH_TUNNEL_ATTR_TUNNEL_DECAP_ECN_MODE,
-
-    /**
-     * @brief Tunnel decap ECN mappers only
-     *
-     * @type sai_object_list_t
-     * @flags CREATE_ONLY
-     * @objects SAI_OBJECT_TYPE_TUNNEL_MAP
-     * @default empty
-     */
-    SAI_SWITCH_TUNNEL_ATTR_DECAP_MAPPERS,
-
-    /**
-     * @brief Tunnel VXLAN UDP source port mode
-     *
-     * @type sai_tunnel_vxlan_udp_sport_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_EPHEMERAL
-     */
-    SAI_SWITCH_TUNNEL_ATTR_TUNNEL_VXLAN_UDP_SPORT_MODE,
-
-    /**
-     * @brief Tunnel UDP source port
-     *
-     * @type sai_uint16_t
-     * @flags CREATE_AND_SET
-     * @isvlan false
-     * @default 0
-     * @validonly SAI_SWITCH_TUNNEL_ATTR_TUNNEL_TYPE == SAI_TUNNEL_TYPE_VXLAN and SAI_SWITCH_TUNNEL_ATTR_TUNNEL_VXLAN_UDP_SPORT_MODE == SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_USER_DEFINED
-     */
-    SAI_SWITCH_TUNNEL_ATTR_VXLAN_UDP_SPORT,
-
-    /**
-     * @brief Tunnel UDP source port mask
-     *
-     * Sport mask defining the number of least significant bits
-     * reserved for the calculated hash value. 0 means a fixed value.
-     *
-     * @type sai_uint8_t
-     * @flags CREATE_AND_SET
-     * @isvlan false
-     * @default 0
-     * @validonly SAI_SWITCH_TUNNEL_ATTR_TUNNEL_TYPE == SAI_TUNNEL_TYPE_VXLAN and SAI_SWITCH_TUNNEL_ATTR_TUNNEL_VXLAN_UDP_SPORT_MODE == SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_USER_DEFINED
-     */
-    SAI_SWITCH_TUNNEL_ATTR_VXLAN_UDP_SPORT_MASK,
-
     /**
      * @brief Enable TC AND COLOR -> DSCP MAP on tunnel at encapsulation (access-to-network) node to remark the DSCP in tunnel header
      *

diff --git a/inc/saitunnel.h b/inc/saitunnel.h
@@ -323,28 +323,8 @@ typedef enum _sai_tunnel_type_t
 
     SAI_TUNNEL_TYPE_MPLS,
 
-    SAI_TUNNEL_TYPE_IPINIP_UDP_ESP,
-
-    SAI_TUNNEL_TYPE_VXLAN_UDP_ESP,
-
 } sai_tunnel_type_t;
 
-/**
- * @brief Defines VXLAN tunnel UDP source port mode
- */
-typedef enum _sai_tunnel_vxlan_udp_sport_mode_t
-{
-    /**
-     * @brief User define value
-     */
-    SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_USER_DEFINED,
-
-    /**
-     * @brief RFC6335 Computed hash value in range 49152-65535
-     */
-    SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_EPHEMERAL,
-} sai_tunnel_vxlan_udp_sport_mode_t;
-
 /**
  * @brief Defines tunnel TTL mode
  */
@@ -672,40 +652,6 @@ typedef enum _sai_tunnel_attr_t
      */
     SAI_TUNNEL_ATTR_LOOPBACK_PACKET_ACTION,
 
-    /**
-     * @brief Tunnel VXLAN UDP source port mode
-     *
-     * @type sai_tunnel_vxlan_udp_sport_mode_t
-     * @flags CREATE_AND_SET
-     * @default SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_EPHEMERAL
-     */
-    SAI_TUNNEL_ATTR_VXLAN_UDP_SPORT_MODE,
-
-    /**
-     * @brief Tunnel UDP source port
-     *
-     * @type sai_uint16_t
-     * @flags CREATE_AND_SET
-     * @isvlan false
-     * @default 0
-     * @validonly SAI_TUNNEL_ATTR_TYPE == SAI_TUNNEL_TYPE_VXLAN and SAI_TUNNEL_ATTR_VXLAN_UDP_SPORT_MODE == SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_USER_DEFINED
-     */
-    SAI_TUNNEL_ATTR_VXLAN_UDP_SPORT,
-
-    /**
-     * @brief Tunnel UDP source port mask
-     *
-     * Sport mask defining the number of least significant bits
-     * reserved for the calculated hash value. 0 means a fixed value.
-     *
-     * @type sai_uint8_t
-     * @flags CREATE_AND_SET
-     * @isvlan false
-     * @default 0
-     * @validonly SAI_TUNNEL_ATTR_TYPE == SAI_TUNNEL_TYPE_VXLAN and SAI_TUNNEL_ATTR_VXLAN_UDP_SPORT_MODE == SAI_TUNNEL_VXLAN_UDP_SPORT_MODE_USER_DEFINED
-     */
-    SAI_TUNNEL_ATTR_VXLAN_UDP_SPORT_MASK,
-
     /**
      * @brief Enable TC AND COLOR -> DSCP MAP on tunnel at encapsulation (access-to-network) node to remark the DSCP in tunnel header
      *