acl: remove redundant macro

[dpdk.git] / examples / quota_watermark / qw / init.c

diff --git a/examples/quota_watermark/qw/init.c b/examples/quota_watermark/qw/init.c
index f42eb8b..afc1366 100644 (file)
--- a/examples/quota_watermark/qw/init.c
+++ b/examples/quota_watermark/qw/init.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -64,24 +64,6 @@ static const struct rte_eth_conf port_conf = {
        },
 };
 
-static const struct rte_eth_rxconf rx_conf = {
-    .rx_thresh = {
-        .pthresh = 8,
-        .hthresh = 8,
-        .wthresh = 4,
-    },
-};
-
-static const struct rte_eth_txconf tx_conf = {
-    .tx_thresh = {
-        .pthresh = 36,
-        .hthresh = 0,
-        .wthresh = 0,
-    },
-    .tx_free_thresh = 0,
-    .tx_rs_thresh = 0,
-};
-
 static struct rte_eth_fc_conf fc_conf = {
     .mode       = RTE_FC_TX_PAUSE,
     .high_water = 80 * 510 / 100,
@@ -104,15 +86,17 @@ void configure_eth_port(uint8_t port_id)
 
     /* Initialize the port's RX queue */
     ret = rte_eth_rx_queue_setup(port_id, 0, RX_DESC_PER_QUEUE,
-                                 rte_eth_dev_socket_id(port_id), &rx_conf,
-                                 mbuf_pool);
+                               rte_eth_dev_socket_id(port_id),
+                               NULL,
+                               mbuf_pool);
     if (ret < 0)
         rte_exit(EXIT_FAILURE, "Failed to setup RX queue on "
                                "port %u (error %d)\n", (unsigned) port_id, ret);
 
     /* Initialize the port's TX queue */
     ret = rte_eth_tx_queue_setup(port_id, 0, TX_DESC_PER_QUEUE,
-                                 rte_eth_dev_socket_id(port_id), &tx_conf);
+                               rte_eth_dev_socket_id(port_id),
+                               NULL);
     if (ret < 0)
         rte_exit(EXIT_FAILURE, "Failed to setup TX queue on "
                                "port %u (error %d)\n", (unsigned) port_id, ret);
@@ -136,18 +120,6 @@ void configure_eth_port(uint8_t port_id)
 void
 init_dpdk(void)
 {
-    int ret;
-
-    /* Initialize the PMD */
-    ret = rte_pmd_init_all();
-    if (ret < 0)
-        rte_exit(EXIT_FAILURE, "Failed to initialize poll mode drivers (error %d)\n", ret);
-
-    /* Bind the drivers to usable devices */
-    ret = rte_eal_pci_probe();
-    if (ret < 0)
-        rte_exit(EXIT_FAILURE, "rte_eal_pci_probe(): error %d\n", ret);
-
     if (rte_eth_dev_count() < 2)
         rte_exit(EXIT_FAILURE, "Not enough ethernet port available\n");
 }
@@ -157,8 +129,8 @@ void init_ring(int lcore_id, uint8_t port_id)
     struct rte_ring *ring;
     char ring_name[RTE_RING_NAMESIZE];
 
-    rte_snprintf(ring_name, RTE_RING_NAMESIZE,
-               "core%d_port%d", lcore_id, port_id);
+    snprintf(ring_name, RTE_RING_NAMESIZE,
+               "core%d_port%d", lcore_id, port_id);
     ring = rte_ring_create(ring_name, RING_SIZE, rte_socket_id(),
                            RING_F_SP_ENQ | RING_F_SC_DEQ);