X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_sched%2Frte_sched.h;h=d61dda9f5f1ebd4b38f7be9f4e228a5d1132a091;hb=a78b9246723bbcb515bd8e592c63b36da6e6c2b5;hp=243efa1d4edf5971a71c04145d6518e19fd1cf91;hpb=5d3f72100904b5a2fc6b240e1cc10f1c2dd02267;p=dpdk.git

diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h
index 243efa1d4e..d61dda9f5f 100644
--- a/lib/librte_sched/rte_sched.h
+++ b/lib/librte_sched/rte_sched.h
@@ -33,7 +33,7 @@ extern "C" {
  *	    classes of the same subport;
  *           - When any subport traffic class is oversubscribed
  *	    (configuration time event), the usage of subport member
- *	    pipes with high demand for thattraffic class pipes is
+ *	    pipes with high demand for that traffic class pipes is
  *	    truncated to a dynamically adjusted value with no
  *             impact to low demand pipes;
  *     3. Pipe:
@@ -205,7 +205,7 @@ struct rte_sched_port_params {
 	 * Every pipe is configured using one of the profiles from this table. */
 	uint32_t n_pipe_profiles;        /**< Profiles in the pipe profile table */
 #ifdef RTE_SCHED_RED
-	struct rte_red_params red_params[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][e_RTE_METER_COLORS]; /**< RED parameters */
+	struct rte_red_params red_params[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS]; /**< RED parameters */
 #endif
 };
 
@@ -249,7 +249,8 @@ rte_sched_port_free(struct rte_sched_port *port);
  * @return
  *   0 upon success, error code otherwise
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_sched_port_pipe_profile_add(struct rte_sched_port *port,
 	struct rte_sched_pipe_params *params,
 	uint32_t *pipe_profile_id);
@@ -374,7 +375,7 @@ void
 rte_sched_port_pkt_write(struct rte_sched_port *port,
 			 struct rte_mbuf *pkt,
 			 uint32_t subport, uint32_t pipe, uint32_t traffic_class,
-			 uint32_t queue, enum rte_meter_color color);
+			 uint32_t queue, enum rte_color color);
 
 /**
  * Scheduler hierarchy path read from packet descriptor (struct
@@ -402,7 +403,7 @@ rte_sched_port_pkt_read_tree_path(struct rte_sched_port *port,
 				  uint32_t *subport, uint32_t *pipe,
 				  uint32_t *traffic_class, uint32_t *queue);
 
-enum rte_meter_color
+enum rte_color
 rte_sched_port_pkt_read_color(const struct rte_mbuf *pkt);
 
 /**