mbuf: clean old refcnt option

CONFIG_RTE_MBUF_SCATTER_GATHER was renamed into CONFIG_RTE_MBUF_REFCNT
by commit 62814bc2e923 and removed by commit 4769bc5a27cc.
Some traces remain because of delayed patches.

It can also be removed from doxygen config.
It is now poisoned in rte_mbuf.h to warn any misuse.

Fixes: d0dff9ba445e ("doc: sample application user guide")
Fixes: fc1f2750a3ec ("doc: programmers guide")
Fixes: 4769bc5a27cc ("mbuf: remove build option to disable refcnt")
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Changchun Ouyang <changchun.ouyang@intel.com>

diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf
index 5a71a76fde231478819657167195fa4f645c0d4e..da03e9b877ad8a90723d9fbf76fcc0f92b8530a8 100644 (file)
--- a/doc/api/doxy-api.conf
+++ b/doc/api/doxy-api.conf
@@ -59,8 +59,7 @@ INPUT                   = doc/api/doxy-api-index.md \
 FILE_PATTERNS           = rte_*.h \
                           cmdline.h
 PREDEFINED              = __DOXYGEN__ \
-                          __attribute__(x)= \
-                          RTE_MBUF_REFCNT
+                          __attribute__(x)=
 
 OPTIMIZE_OUTPUT_FOR_C   = YES
 ENABLE_PREPROCESSING    = YES

diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst
index d2c124ec48c0c00d77f3dfc49ce104bdb7d949c8..70cd5915312bb6459be6d331043bb748effb0bf3 100644 (file)
--- a/doc/guides/nics/ixgbe.rst
+++ b/doc/guides/nics/ixgbe.rst
@@ -168,8 +168,6 @@ When CONFIG_RTE_IXGBE_RX_OLFLAGS_DISABLE=y, better performance can be achieved:
 
     ./x86_64-native-linuxapp-gcc/app/testpmd -c 300 -n 4 -- -i --burst=32 --rxfreet=32 --mbcache=250 --txpt=32 --rxht=8 --rxwt=0 --txfreet=32 --txrst=32 --txqflags=0xf01 --disable-hw-vlan
 
-If scatter gather lists are not required, set CONFIG_RTE_MBUF_SCATTER_GATHER=n for better throughput.
-
 l3fwd
 ^^^^^
 

diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
index d17daa79dbde2c7520365f35861525421cc4d3e1..7d6bdaa6fe22759be85872aed75008140a521f8b 100644 (file)
--- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
+++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
@@ -54,7 +54,6 @@ Finally 'direct' and 'indirect' mbufs for each fragnemt are linked together via
 
 The caller has an ability to explicitly specify which mempools should be used to allocate 'direct' and 'indirect' mbufs from.
 
-Note that configuration macro RTE_MBUF_SCATTER_GATHER has to be enabled to make fragmentation library build and work correctly.
 For more information about direct and indirect mbufs, refer to the *DPDK Programmers guide 7.7 Direct and Indirect Buffers.*
 
 Packet reassembly

diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst
index cd9b2322398a8d348fdbdd866890959bc8f09453..8a7eb3b84074c2811af731c6e01077cab06058fd 100644 (file)
--- a/doc/guides/sample_app_ug/vhost.rst
+++ b/doc/guides/sample_app_ug/vhost.rst
@@ -336,28 +336,6 @@ Compiling the Sample Code
 
 #.  Build the application:
 
-    .. code-block:: console
-
-        make
-
-    .. note::
-
-        Note For zero copy, need firstly disable CONFIG_RTE_MBUF_SCATTER_GATHER,
-        CONFIG_RTE_LIBRTE_IP_FRAG and CONFIG_RTE_LIBRTE_DISTRIBUTOR
-        in the config file and then re-configure and compile the core lib, and then build the application:
-
-    .. code-block:: console
-
-        vi ${RTE_SDK}/config/common_linuxapp
-
-    change it as follows:
-
-    ::
-
-        CONFIG_RTE_MBUF_SCATTER_GATHER=n
-        CONFIG_RTE_LIBRTE_IP_FRAG=n
-        CONFIG_RTE_LIBRTE_DISTRIBUTOR=n
-
     .. code-block:: console
 
         cd ${RTE_SDK}

diff --git a/lib/librte_ether/rte_ether.h b/lib/librte_ether/rte_ether.h
index bafeb2b8e4642facddf600b75e5054bffd317964..49f457617d6a07237d7b15e694e84534d539723b 100644 (file)
--- a/lib/librte_ether/rte_ether.h
+++ b/lib/librte_ether/rte_ether.h
@@ -383,7 +383,6 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
        struct ether_hdr *oh, *nh;
        struct vlan_hdr *vh;
 
-#ifdef RTE_MBUF_REFCNT
        /* Can't insert header if mbuf is shared */
        if (rte_mbuf_refcnt_read(*m) > 1) {
                struct rte_mbuf *copy;
@@ -394,7 +393,7 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
                rte_pktmbuf_free(*m);
                *m = copy;
        }
-#endif
+
        oh = rte_pktmbuf_mtod(*m, struct ether_hdr *);
        nh = (struct ether_hdr *)
                rte_pktmbuf_prepend(*m, sizeof(struct vlan_hdr));

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 02651729a64c6467783fe60a7a562fc43f7b318f..45f73c2b6e4262f572b4fd1f074e607df95b7782 100644 (file)
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -64,8 +64,9 @@
 extern "C" {
 #endif
 
-/* deprecated feature, renamed in RTE_MBUF_REFCNT */
+/* deprecated options */
 #pragma GCC poison RTE_MBUF_SCATTER_GATHER
+#pragma GCC poison RTE_MBUF_REFCNT
 
 /*
  * Packet Offload Features Flags. It also carry packet type information.