From: Stephen Hemminger <shemm...@brocade.com>
The actual port_hierarchy was deprecated and hidden in 2.1
so drop it from view in DPDK 2.2
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
lib/librte_sched/rte_sched.c | 14 +++++++-------
lib/librte_sched/rte_sched.h | 14 --------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c
index 9c9419d..9478798 100644
--- a/lib/librte_sched/rte_sched.c
+++ b/lib/librte_sched/rte_sched.c
@@ -191,7 +191,7 @@ enum grinder_state {
* each packet, typically written by the classification stage and read
* by scheduler enqueue.
*/
-struct __rte_sched_port_hierarchy {
+struct rte_sched_port_hierarchy {
uint32_t queue:2; /**< Queue ID (0 .. 3) */
uint32_t traffic_class:2; /**< Traffic class ID (0 .. 3)*/
uint32_t pipe:20; /**< Pipe ID */
@@ -930,8 +930,8 @@ rte_sched_port_pkt_write(struct rte_mbuf *pkt,
uint32_t subport, uint32_t pipe, uint32_t
traffic_class,
uint32_t queue, enum rte_meter_color color)
{
- struct __rte_sched_port_hierarchy *sched
- = (struct __rte_sched_port_hierarchy *) &pkt->hash.sched;
+ struct rte_sched_port_hierarchy *sched
+ = (struct rte_sched_port_hierarchy *) &pkt->hash.sched;
sched->color = (uint32_t) color;
sched->subport = subport;
@@ -945,8 +945,8 @@ rte_sched_port_pkt_read_tree_path(const struct rte_mbuf
*pkt,
uint32_t *subport, uint32_t *pipe,
uint32_t *traffic_class, uint32_t *queue)
{
- const struct __rte_sched_port_hierarchy *sched
- = (const struct __rte_sched_port_hierarchy *) &pkt->hash.sched;
+ const struct rte_sched_port_hierarchy *sched
+ = (const struct rte_sched_port_hierarchy *) &pkt->hash.sched;
*subport = sched->subport;
*pipe = sched->pipe;
@@ -958,8 +958,8 @@ rte_sched_port_pkt_read_tree_path(const struct rte_mbuf
*pkt,
enum rte_meter_color
rte_sched_port_pkt_read_color(const struct rte_mbuf *pkt)
{
- const struct __rte_sched_port_hierarchy *sched
- = (const struct __rte_sched_port_hierarchy *) &pkt->hash.sched;
+ const struct rte_sched_port_hierarchy *sched
+ = (const struct rte_sched_port_hierarchy *) &pkt->hash.sched;
return (enum rte_meter_color) sched->color;
}
diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h
index 1ead267..9bdd51c 100644
--- a/lib/librte_sched/rte_sched.h
+++ b/lib/librte_sched/rte_sched.h
@@ -196,20 +196,6 @@ struct rte_sched_port_params {
};
/*
- * Path through scheduler hierarchy
- *
- * Note: direct access to internal bitfields is deprecated to allow for future
expansion.
- * Use rte_sched_port_pkt_read/write API instead
- */
-struct rte_sched_port_hierarchy {
- uint32_t queue:2; /**< Queue ID (0 .. 3) */
- uint32_t traffic_class:2; /**< Traffic class ID (0 .. 3)*/
- uint32_t pipe:20; /**< Pipe ID */
- uint32_t subport:6; /**< Subport ID */
- uint32_t color:2; /**< Color */
-} __attribute__ ((deprecated));
-
-/*
* Configuration
*
***/
--
2.1.4
