mbuf: remove the rte_pktmbuf structure

[dpdk.git] / examples / ipv4_multicast / main.c

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index f9304d1..cc12d9d 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -1,35 +1,34 @@
 /*-
  *   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 
+ *
+ *   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 
+ *
+ *     * 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 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * 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 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   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
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <stdio.h>
@@ -330,21 +329,21 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone)
        }
 
        /* prepend new header */
-       hdr->pkt.next = pkt;
+       hdr->next = pkt;
 
 
        /* update header's fields */
-       hdr->pkt.pkt_len = (uint16_t)(hdr->pkt.data_len + pkt->pkt.pkt_len);
-       hdr->pkt.nb_segs = (uint8_t)(pkt->pkt.nb_segs + 1);
+       hdr->pkt_len = (uint16_t)(hdr->data_len + pkt->pkt_len);
+       hdr->nb_segs = (uint8_t)(pkt->nb_segs + 1);
 
        /* copy metadata from source packet*/
-       hdr->pkt.in_port = pkt->pkt.in_port;
-       hdr->pkt.vlan_macip = pkt->pkt.vlan_macip;
-       hdr->pkt.hash = pkt->pkt.hash;
+       hdr->in_port = pkt->in_port;
+       hdr->vlan_macip = pkt->vlan_macip;
+       hdr->hash = pkt->hash;
 
        hdr->ol_flags = pkt->ol_flags;
 
-       __rte_mbuf_sanity_check(hdr, RTE_MBUF_PKT, 1);
+       __rte_mbuf_sanity_check(hdr, 1);
        return (hdr);
 }
 
@@ -413,7 +412,7 @@ mcast_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf)
 
        /* Should we use rte_pktmbuf_clone() or not. */
        use_clone = (port_num <= MCAST_CLONE_PORTS &&
-           m->pkt.nb_segs <= MCAST_CLONE_SEGS);
+           m->nb_segs <= MCAST_CLONE_SEGS);
 
        /* Mark all packet's segments as referenced port_num times */
        if (use_clone == 0)
@@ -715,7 +714,7 @@ MAIN(int argc, char **argv)
        struct lcore_queue_conf *qconf;
        int ret;
        uint16_t queueid;
-       unsigned lcore_id = 0, rx_lcore_id = 0;;
+       unsigned lcore_id = 0, rx_lcore_id = 0;
        uint32_t n_tx_queue, nb_lcores;
        uint8_t portid;
 
@@ -754,10 +753,6 @@ MAIN(int argc, char **argv)
        if (clone_pool == NULL)
                rte_exit(EXIT_FAILURE, "Cannot init clone mbuf pool\n");
 
-       /* init driver */
-       if (rte_pmd_init_all() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot init pmd\n");
-
        if (rte_eal_pci_probe() < 0)
                rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");