ring: remove deprecated functions

These were deprecated in 2.0 so remove them from 2.2.
The library version is incremented.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 04819fa..5f6079b 100644 (file)
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -40,9 +40,6 @@ Deprecation Notices
   the tunnel type, TNI/VNI, inner MAC and inner VLAN are monitored.
   The release 2.2 will contain these changes without backwards compatibility.
 
-* librte_pmd_ring: The deprecated functions rte_eth_ring_pair_create and
-  rte_eth_ring_pair_attach should be removed.
-
 * ABI changes are planned for struct virtio_net in order to support vhost-user
   multiple queues feature.
   It should be integrated in release 2.2 without backward compatibility.

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index 6dcfe88..abe57b4 100644 (file)
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -24,6 +24,9 @@ API Changes
 * The deprecated KNI functions are removed:
   rte_kni_create(), rte_kni_get_port_id() and rte_kni_info_get().
 
+* The deprecated ring PMD functions are removed:
+  rte_eth_ring_pair_create() and rte_eth_ring_pair_attach().
+
 
 ABI Changes
 -----------
@@ -67,7 +70,7 @@ The libraries prepended with a plus sign were incremented in this version.
      librte_meter.so.1
      librte_pipeline.so.1
      librte_pmd_bond.so.1
-     librte_pmd_ring.so.1
+   + librte_pmd_ring.so.2
      librte_port.so.1
      librte_power.so.1
      librte_reorder.so.1

diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile
index e442d0b..ae83505 100644 (file)
--- a/drivers/net/ring/Makefile
+++ b/drivers/net/ring/Makefile
@@ -41,7 +41,7 @@ CFLAGS += $(WERROR_FLAGS)
 
 EXPORT_MAP := rte_eth_ring_version.map
 
-LIBABIVER := 1
+LIBABIVER := 2
 
 #
 # all source are stored in SRCS-y

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 6fd3d0a..0ba36d5 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -391,62 +391,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) < 0 ||
-                       rte_eth_from_rings(tx_rng_name, tx, num_rings, rx,
-                               num_rings, numa_node) < 0)
-               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.h b/drivers/net/ring/rte_eth_ring.h
index 2262249..5a69bff 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.h
+++ b/drivers/net/ring/rte_eth_ring.h
@@ -65,9 +65,6 @@ int rte_eth_from_rings(const char *name,
                const unsigned nb_tx_queues,
                const unsigned numa_node);
 
-int rte_eth_ring_pair_create(const char *name, const unsigned numa_node);
-int rte_eth_ring_pair_attach(const char *name, const unsigned numa_node);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/drivers/net/ring/rte_eth_ring_version.map b/drivers/net/ring/rte_eth_ring_version.map
index 8ad107d..0875e25 100644 (file)
--- a/drivers/net/ring/rte_eth_ring_version.map
+++ b/drivers/net/ring/rte_eth_ring_version.map
@@ -2,8 +2,6 @@ DPDK_2.0 {
        global:
 
        rte_eth_from_rings;
-       rte_eth_ring_pair_attach;
-       rte_eth_ring_pair_create;
 
        local: *;
 };