apps: use helper to create mbuf pools

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

diff --git a/examples/quota_watermark/qw/main.c b/examples/quota_watermark/qw/main.c
index f5b6e08..8ed0214 100644 (file)
--- a/examples/quota_watermark/qw/main.c
+++ b/examples/quota_watermark/qw/main.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   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
@@ -97,15 +97,15 @@ static void send_pause_frame(uint8_t port_id, uint16_t duration)
     ether_addr_copy(&mac_addr, &hdr->s_addr);
 
     void *tmp = &hdr->d_addr.addr_bytes[0];
-    *((uint64_t *)tmp) = 0x010000C28001;
+    *((uint64_t *)tmp) = 0x010000C28001ULL;
 
     hdr->ether_type = rte_cpu_to_be_16(ETHER_TYPE_FLOW_CONTROL);
 
     pause_frame->opcode = rte_cpu_to_be_16(0x0001);
     pause_frame->param  = rte_cpu_to_be_16(duration);
 
-    mbuf->pkt.pkt_len  = 60;
-    mbuf->pkt.data_len = 60;
+    mbuf->pkt_len  = 60;
+    mbuf->data_len = 60;
 
     rte_eth_tx_burst(port_id, 0, &mbuf, 1);
 }
@@ -304,7 +304,7 @@ send_stage(__attribute__((unused)) void *args)
 }
 
 int
-MAIN(int argc, char **argv)
+main(int argc, char **argv)
 {
     int ret;
     unsigned int lcore_id, master_lcore_id, last_lcore_id;
@@ -335,11 +335,8 @@ MAIN(int argc, char **argv)
         rte_exit(EXIT_FAILURE, "Invalid quota/watermark argument(s)\n");
 
     /* Create a pool of mbuf to store packets */
-    mbuf_pool = rte_mempool_create("mbuf_pool", MBUF_PER_POOL, MBUF_SIZE, 32,
-                                   sizeof(struct rte_pktmbuf_pool_private),
-                                   rte_pktmbuf_pool_init, NULL,
-                                   rte_pktmbuf_init, NULL,
-                                   rte_socket_id(), 0);
+    mbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", MBUF_PER_POOL, 32, 0,
+           MBUF_DATA_SIZE, rte_socket_id());
     if (mbuf_pool == NULL)
         rte_panic("%s\n", rte_strerror(rte_errno));
 
@@ -358,7 +355,7 @@ MAIN(int argc, char **argv)
             for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++)
                 if (is_bit_set(port_id, portmask))
                     init_ring(lcore_id, port_id);
-            
+
             /* typecast is a workaround for GCC 4.3 bug */
             rte_eal_remote_launch((int (*)(void *))pipeline_stage, NULL, lcore_id);
         }
@@ -367,7 +364,7 @@ MAIN(int argc, char **argv)
     /* Start send_stage() on the last slave core */
     /* typecast is a workaround for GCC 4.3 bug */
     rte_eal_remote_launch((int (*)(void *))send_stage, NULL, last_lcore_id);
-    
+
     /* Start receive_stage() on the master core */
     receive_stage(NULL);