From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id EB4A3C1BC for ; Fri, 13 Nov 2015 18:58:25 +0100 (CET) Received: by pacdm15 with SMTP id dm15so106438009pac.3 for ; Fri, 13 Nov 2015 09:58:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2kON90UmiB3Eb7uM2y1wgk3WF+qP09FjQQHmVKZd8xU=; b=1UEcx0zGHxYJ3JCEvuIM719GrVoTxuZjypSHSF3V51lqYaj8O+tk0lF0Q0Ua7N8wxM Q41mTT0BVeajgD3BlxBFM0iGrOqnkPai4qOt2+nNReblOpOuGgz0wtyZl+xY/WJc6tMR RkwLvr4rbHMwQbSr7UPMpIL3By3wzrasmBqsoSO4jPza3ChEmxDBO7hPBnLh53KB+gFJ +mQyexTr98X0q4BBU44hmchYDLhWx8rnlJXI9c3VmQkLNh6i9CXLxYhXJ/7dYkeDXqKb TMMOo2O6feCxqLdmAPMraSqk5gb/gdiazDYXIGvZp7QNhQ5K4lkRkb9Dur8MOQh7mp38 wN2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2kON90UmiB3Eb7uM2y1wgk3WF+qP09FjQQHmVKZd8xU=; b=j840fQC+jhk/CNHdBYYUqvl4hJYGfArczrxktiER/BA3rXGSIdtJsT3m5j5DpxPtsr Da0iBCw+ux3Cc1ePl+ACMIRpEZfclzHyevgajcWjJRgull9VFFEtegSvgwzpGJynKVmZ vcykU6UZl9jHSe42CrZC5blqrKRXU5CKyAQ+5g+Ifsp6WOZ6iSLtODZXxXCSysZVkOZJ 2wxKvGFMC4HuGiY4vDS5Kb9xq459TlspxUWMbDlk60eSxbCWNu+R4KveLxAIQh3Ajqah dtvg4rTZv+dkh4RhAF98mz9bGgyv5i3Yi/kLFv9KHlDpStF+HbjWE9h2SsC+zkwlgxsk hVWw== X-Gm-Message-State: ALoCoQlUXwAUUeWeWjbBCaOiVwzBG4EyQqj83oLHULokDVZRNZ+DUzkr0zwm3QAZFU9n6mK3KWat X-Received: by 10.68.89.197 with SMTP id bq5mr34294882pbb.1.1447437505372; Fri, 13 Nov 2015 09:58:25 -0800 (PST) Received: from xeon-e3.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by smtp.gmail.com with ESMTPSA id bd10sm21603143pbd.29.2015.11.13.09.58.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Nov 2015 09:58:24 -0800 (PST) From: Stephen Hemminger To: cristian.dumitrescu@intel.com Date: Fri, 13 Nov 2015 09:58:27 -0800 Message-Id: <1447437516-19152-2-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> References: <1447437516-19152-1-git-send-email-stephen@networkplumber.org> Cc: dev@dpdk.org, Stephen Hemminger Subject: [dpdk-dev] [PATCH v2 01/10] sched: drop deprecated port hierarchy structure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2015 17:58:26 -0000 From: Stephen Hemminger 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 --- 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