X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_ethdev%2Frte_tm.h;h=03eaa0004099894da3c165e0d7d357672cefcac9;hb=1e88a5c385b0327ddd1c4eceb1f7aaabc4f2c0b3;hp=c4a788b8599123d0013378d8ad9b064f4c3ca108;hpb=c712b0132645eff71bbc11fb18659c5775c1d3d7;p=dpdk.git

diff --git a/lib/librte_ethdev/rte_tm.h b/lib/librte_ethdev/rte_tm.h
index c4a788b859..03eaa00040 100644
--- a/lib/librte_ethdev/rte_tm.h
+++ b/lib/librte_ethdev/rte_tm.h
@@ -116,13 +116,6 @@ extern "C" {
  */
 #define RTE_TM_NODE_LEVEL_ID_ANY                     UINT32_MAX
 
-/* New rte_color is defined and used to deprecate rte_tm_color soon. */
-#define rte_tm_color rte_color
-#define RTE_TM_GREEN RTE_COLOR_GREEN
-#define RTE_TM_YELLOW RTE_COLOR_YELLOW
-#define RTE_TM_RED RTE_COLOR_RED
-#define RTE_TM_COLORS RTE_COLORS
-
 /**
  * Node statistics counter type
  */
@@ -177,12 +170,12 @@ struct rte_tm_node_stats {
 		/** Number of packets dropped by current leaf node per each
 		 * color.
 		 */
-		uint64_t n_pkts_dropped[RTE_TM_COLORS];
+		uint64_t n_pkts_dropped[RTE_COLORS];
 
 		/** Number of bytes dropped by current leaf node per each
 		 * color.
 		 */
-		uint64_t n_bytes_dropped[RTE_TM_COLORS];
+		uint64_t n_bytes_dropped[RTE_COLORS];
 
 		/** Number of packets currently waiting in the packet queue of
 		 * current leaf node.
@@ -376,7 +369,7 @@ struct rte_tm_capabilities {
 	uint32_t sched_wfq_weight_max;
 
 	/** WRED packet mode support. When non-zero, this parameter indicates
-	 * that there is atleast one leaf node that supports the WRED packet
+	 * that there is at least one leaf node that supports the WRED packet
 	 * mode, which might not be true for all the leaf nodes. In packet
 	 * mode, the WRED thresholds specify the queue length in packets, as
 	 * opposed to bytes.
@@ -384,7 +377,7 @@ struct rte_tm_capabilities {
 	int cman_wred_packet_mode_supported;
 
 	/** WRED byte mode support. When non-zero, this parameter indicates that
-	 * there is atleast one leaf node that supports the WRED byte mode,
+	 * there is at least one leaf node that supports the WRED byte mode,
 	 * which might not be true for all the leaf nodes. In byte mode, the
 	 * WRED thresholds specify the queue length in bytes, as opposed to
 	 * packets.
@@ -433,16 +426,16 @@ struct rte_tm_capabilities {
 	uint32_t cman_wred_context_shared_n_contexts_per_node_max;
 
 	/** Support for VLAN DEI packet marking (per color). */
-	int mark_vlan_dei_supported[RTE_TM_COLORS];
+	int mark_vlan_dei_supported[RTE_COLORS];
 
 	/** Support for IPv4/IPv6 ECN marking of TCP packets (per color). */
-	int mark_ip_ecn_tcp_supported[RTE_TM_COLORS];
+	int mark_ip_ecn_tcp_supported[RTE_COLORS];
 
 	/** Support for IPv4/IPv6 ECN marking of SCTP packets (per color). */
-	int mark_ip_ecn_sctp_supported[RTE_TM_COLORS];
+	int mark_ip_ecn_sctp_supported[RTE_COLORS];
 
 	/** Support for IPv4/IPv6 DSCP packet marking (per color). */
-	int mark_ip_dscp_supported[RTE_TM_COLORS];
+	int mark_ip_dscp_supported[RTE_COLORS];
 
 	/** Set of supported dynamic update operations.
 	 * @see enum rte_tm_dynamic_update_type
@@ -643,7 +636,7 @@ struct rte_tm_level_capabilities {
 			uint32_t shaper_shared_n_max;
 
 			/** WRED packet mode support. When non-zero, this
-			 * parameter indicates that there is atleast one leaf
+			 * parameter indicates that there is at least one leaf
 			 * node on this level that supports the WRED packet
 			 * mode, which might not be true for all the leaf
 			 * nodes. In packet mode, the WRED thresholds specify
@@ -652,7 +645,7 @@ struct rte_tm_level_capabilities {
 			int cman_wred_packet_mode_supported;
 
 			/** WRED byte mode support. When non-zero, this
-			 * parameter indicates that there is atleast one leaf
+			 * parameter indicates that there is at least one leaf
 			 * node on this level that supports the WRED byte mode,
 			 * which might not be true for all the leaf nodes. In
 			 * byte mode, the WRED thresholds specify the queue
@@ -859,7 +852,7 @@ struct rte_tm_red_params {
  */
 struct rte_tm_wred_params {
 	/** One set of RED parameters per packet color */
-	struct rte_tm_red_params red_params[RTE_TM_COLORS];
+	struct rte_tm_red_params red_params[RTE_COLORS];
 
 	/** When non-zero, the *min_th* and *max_th* thresholds are specified
 	 * in packets (WRED packet mode). When zero, the *min_th* and *max_th*