From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id 647FF2716 for ; Mon, 15 Jun 2015 18:51:24 +0200 (CEST) Received: by pacyx8 with SMTP id yx8so69026879pac.2 for ; Mon, 15 Jun 2015 09:51:23 -0700 (PDT) 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=1GstmIu9Ce26qB0CkN0Jnghe0v49AQVRPgs9m2mrRUw=; b=ALhES+x404hB9jg8Hx+j+/sVpwjC1XuD+ZD7vEpKE8DzN6VeKS47AmmAJkM6+t50RF Rd2WOC40GmPhpWQ4RyfKIQbtFerVMz2TE2oXmQeQ90NgpE/ieTLRClrsHCG8kwQmIsa9 2Ji3/o5ihK8RSAC6CMH+MLu2vf3rxmz00kgw0S5IFs9T6QxZaevofycch2j/UOqEIMx5 v75wD/g3TBS40wuYT12OzjuMrXp0q3alfxj29rE+x9ZJ9DMb78kE/iH6sHM03RYGklI0 vw7lx+dQ7cYFtnapVSPqoKcUL3ngZamddgddRoE1zfk1CPHXW5ohZ8JHL+CDZM1/2O+u wyBg== X-Gm-Message-State: ALoCoQn6ntXpDvjr7fDrGGvrozcGM/ppfMbhEeOml+XcXSwRR/J2MeuUDom4R5ZgCr7KbvT9FHqt X-Received: by 10.68.238.228 with SMTP id vn4mr31048665pbc.166.1434387083645; Mon, 15 Jun 2015 09:51:23 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id pc9sm12790145pdb.6.2015.06.15.09.51.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Jun 2015 09:51:22 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Date: Mon, 15 Jun 2015 09:51:11 -0700 Message-Id: <1434387073-16951-2-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1434387073-16951-1-git-send-email-stephen@networkplumber.org> References: <1434387073-16951-1-git-send-email-stephen@networkplumber.org> Cc: Stephen Hemminger Subject: [dpdk-dev] [PATCH 1/3] pmd_ring: remove deprecated functions 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: Mon, 15 Jun 2015 16:51:24 -0000 From: Stephen Hemminger These were deprecated in 2.0 so remove them from 2.1 Signed-off-by: Stephen Hemminger --- drivers/net/ring/rte_eth_ring.c | 55 ------------------------------- drivers/net/ring/rte_eth_ring_version.map | 4 +-- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 6832f01..3dd96ca 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -390,61 +390,6 @@ eth_dev_ring_create(const char *name, const unsigned numa_node, return 0; } - -static int -eth_dev_ring_pair_create(const char *name, const unsigned numa_node, - enum dev_action action) -{ - /* rx and tx are so-called from point of view of first port. - * They are inverted from the point of view of second port - */ - struct rte_ring *rx[RTE_PMD_RING_MAX_RX_RINGS]; - struct rte_ring *tx[RTE_PMD_RING_MAX_TX_RINGS]; - unsigned i; - char rx_rng_name[RTE_RING_NAMESIZE]; - char tx_rng_name[RTE_RING_NAMESIZE]; - unsigned num_rings = RTE_MIN(RTE_PMD_RING_MAX_RX_RINGS, - RTE_PMD_RING_MAX_TX_RINGS); - - for (i = 0; i < num_rings; i++) { - snprintf(rx_rng_name, sizeof(rx_rng_name), "ETH_RX%u_%s", i, name); - rx[i] = (action == DEV_CREATE) ? - rte_ring_create(rx_rng_name, 1024, numa_node, - RING_F_SP_ENQ|RING_F_SC_DEQ) : - rte_ring_lookup(rx_rng_name); - if (rx[i] == NULL) - return -1; - snprintf(tx_rng_name, sizeof(tx_rng_name), "ETH_TX%u_%s", i, name); - tx[i] = (action == DEV_CREATE) ? - rte_ring_create(tx_rng_name, 1024, numa_node, - RING_F_SP_ENQ|RING_F_SC_DEQ): - rte_ring_lookup(tx_rng_name); - if (tx[i] == NULL) - return -1; - } - - if (rte_eth_from_rings(rx_rng_name, rx, num_rings, tx, num_rings, - numa_node) || rte_eth_from_rings(tx_rng_name, tx, num_rings, rx, - num_rings, numa_node)) - return -1; - - return 0; -} - -int -rte_eth_ring_pair_create(const char *name, const unsigned numa_node) -{ - RTE_LOG(WARNING, PMD, "rte_eth_ring_pair_create is deprecated\n"); - return eth_dev_ring_pair_create(name, numa_node, DEV_CREATE); -} - -int -rte_eth_ring_pair_attach(const char *name, const unsigned numa_node) -{ - RTE_LOG(WARNING, PMD, "rte_eth_ring_pair_attach is deprecated\n"); - return eth_dev_ring_pair_create(name, numa_node, DEV_ATTACH); -} - struct node_action_pair { char name[PATH_MAX]; unsigned node; diff --git a/drivers/net/ring/rte_eth_ring_version.map b/drivers/net/ring/rte_eth_ring_version.map index 8ad107d..5ee55d9 100644 --- a/drivers/net/ring/rte_eth_ring_version.map +++ b/drivers/net/ring/rte_eth_ring_version.map @@ -1,9 +1,7 @@ -DPDK_2.0 { +DPDK_2.1 { global: rte_eth_from_rings; - rte_eth_ring_pair_attach; - rte_eth_ring_pair_create; local: *; }; -- 2.1.4