doc: introduce networking driver matrix

[dpdk.git] / app / test / test_table_pipeline.c

diff --git a/app/test/test_table_pipeline.c b/app/test/test_table_pipeline.c
index 35644a6..ff07cda 100644 (file)
--- a/app/test/test_table_pipeline.c
+++ b/app/test/test_table_pipeline.c
@@ -31,12 +31,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RTE_LIBRTE_PIPELINE
-
-#include "test.h"
-
-#else
-
 #include <string.h>
 #include <rte_pipeline.h>
 #include <rte_log.h>
@@ -45,11 +39,6 @@
 #include "test_table.h"
 #include "test_table_pipeline.h"
 
-#define RTE_CBUF_UINT8_PTR(cbuf, offset)                       \
-       (&cbuf->data[offset])
-#define RTE_CBUF_UINT32_PTR(cbuf, offset)                      \
-       (&cbuf->data32[offset/sizeof(uint32_t)])
-
 #if 0
 
 static rte_pipeline_port_out_action_handler port_action_0x00
@@ -468,7 +457,8 @@ test_pipeline_single_filter(int test_type, int expected_count)
                                rte_panic("Failed to alloc mbuf from pool\n");
                                return -1;
                        }
-                       key = RTE_MBUF_METADATA_UINT8_PTR(m, 32);
+                       key = RTE_MBUF_METADATA_UINT8_PTR(m,
+                                       APP_METADATA_OFFSET(32));
 
                        k32 = (uint32_t *) key;
                        k32[0] = 0xadadadad >> (j % 2);
@@ -504,8 +494,9 @@ test_pipeline_single_filter(int test_type, int expected_count)
                        printf("Got %d object(s) from ring %d!\n", ret, i);
                        for (j = 0; j < ret; j++) {
                                mbuf = (struct rte_mbuf *)objs[j];
-                               rte_hexdump(stdout, "Object:", mbuf->pkt.data,
-                                       mbuf->pkt.data_len);
+                               rte_hexdump(stdout, "Object:",
+                                       rte_pktmbuf_mtod(mbuf, char *),
+                                       mbuf->data_len);
                                rte_pktmbuf_free(mbuf);
                        }
                        tx_count += ret;
@@ -599,5 +590,3 @@ test_table_pipeline(void)
 
        return 0;
 }
-
-#endif