update copyright date to 2013

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

diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 91625a4..548c36a 100644 (file)
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -69,7 +69,6 @@
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
-#include <rte_hash_crc.h>
 #include <rte_fbk_hash.h>
 #include <rte_ip.h>
 
@@ -176,6 +175,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_strip_crc   = 0, /**< CRC stripped by hardware */
        },
        .txmode = {
+               .mq_mode = ETH_DCB_NONE,
        },
 };
 
@@ -341,9 +341,7 @@ mcast_out_pkt(struct rte_mbuf *pkt, int use_clone)
 
        /* copy metadata from source packet*/
        hdr->pkt.in_port = pkt->pkt.in_port;
-       hdr->pkt.vlan_tci = pkt->pkt.vlan_tci;
-       hdr->pkt.l2_len = pkt->pkt.l2_len;
-       hdr->pkt.l3_len = pkt->pkt.l3_len;
+       hdr->pkt.vlan_macip = pkt->pkt.vlan_macip;
        hdr->pkt.hash = pkt->pkt.hash;
 
        hdr->ol_flags = pkt->ol_flags;
@@ -471,7 +469,7 @@ static __attribute__((noreturn)) int
 main_loop(__rte_unused void *dummy)
 {
        struct rte_mbuf *pkts_burst[MAX_PKT_BURST];
-       uint32_t lcore_id;
+       unsigned lcore_id;
        int i, j, nb_rx;
        uint8_t portid;
        struct lcore_queue_conf *qconf;
@@ -656,11 +654,65 @@ init_mcast_hash(void)
        return 0;
 }
 
+/* Check the link status of all ports in up to 9s, and print them finally */
+static void
+check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
+{
+#define CHECK_INTERVAL 100 /* 100ms */
+#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
+       uint8_t portid, count, all_ports_up, print_flag = 0;
+       struct rte_eth_link link;
+
+       printf("\nChecking link status");
+       fflush(stdout);
+       for (count = 0; count <= MAX_CHECK_TIME; count++) {
+               all_ports_up = 1;
+               for (portid = 0; portid < port_num; portid++) {
+                       if ((port_mask & (1 << portid)) == 0)
+                               continue;
+                       memset(&link, 0, sizeof(link));
+                       rte_eth_link_get_nowait(portid, &link);
+                       /* print link status if flag set */
+                       if (print_flag == 1) {
+                               if (link.link_status)
+                                       printf("Port %d Link Up - speed %u "
+                                               "Mbps - %s\n", (uint8_t)portid,
+                                               (unsigned)link.link_speed,
+                               (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
+                                       ("full-duplex") : ("half-duplex\n"));
+                               else
+                                       printf("Port %d Link Down\n",
+                                                       (uint8_t)portid);
+                               continue;
+                       }
+                       /* clear all_ports_up flag if any link down */
+                       if (link.link_status == 0) {
+                               all_ports_up = 0;
+                               break;
+                       }
+               }
+               /* after finally printing all link status, get out */
+               if (print_flag == 1)
+                       break;
+
+               if (all_ports_up == 0) {
+                       printf(".");
+                       fflush(stdout);
+                       rte_delay_ms(CHECK_INTERVAL);
+               }
+
+               /* set the print_flag if all ports up or timeout */
+               if (all_ports_up == 1 || count == (MAX_CHECK_TIME - 1)) {
+                       print_flag = 1;
+                       printf("done\n");
+               }
+       }
+}
+
 int
 MAIN(int argc, char **argv)
 {
        struct lcore_queue_conf *qconf;
-       struct rte_eth_link link;
        int ret;
        uint16_t queueid;
        unsigned lcore_id = 0, rx_lcore_id = 0;;
@@ -703,14 +755,8 @@ MAIN(int argc, char **argv)
                rte_exit(EXIT_FAILURE, "Cannot init clone mbuf pool\n");
 
        /* init driver */
-#ifdef RTE_LIBRTE_IGB_PMD
-       if (rte_igb_pmd_init() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot init igb pmd\n");
-#endif
-#ifdef RTE_LIBRTE_IXGBE_PMD
-       if (rte_ixgbe_pmd_init() < 0)
-               rte_exit(EXIT_FAILURE, "Cannot init ixgbe pmd\n");
-#endif
+       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");
@@ -800,22 +846,10 @@ MAIN(int argc, char **argv)
                        rte_exit(EXIT_FAILURE, "rte_eth_dev_start: err=%d, port=%d\n",
                                  ret, portid);
 
-               printf("done: ");
-
-               /* get link status */
-               rte_eth_link_get(portid, &link);
-               if (link.link_status) {
-                       printf(" Link Up - speed %u Mbps - %s\n",
-                              (uint32_t) link.link_speed,
-                              (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                              ("full-duplex") : ("half-duplex\n"));
-                       rte_eth_promiscuous_enable(portid);
-                       rte_eth_allmulticast_enable(portid);
-               } else {
-                       printf(" Link Down\n");
-               }
+               printf("done:\n");
        }
 
+       check_all_ports_link_status(nb_ports, enabled_port_mask);
 
        /* initialize the multicast hash */
        int retval = init_mcast_hash();