common/sfc_efx/base: add interrupts module for Riverhead

[dpdk.git] / examples / ip_pipeline / cli.c

diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index c720306..dafc95a 100644 (file)
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -273,7 +273,7 @@ print_link_info(struct link *link, char *out, size_t out_size)
                "\n"
                "%s: flags=<%s> mtu %u\n"
                "\tether %02X:%02X:%02X:%02X:%02X:%02X rxqueues %u txqueues %u\n"
-               "\tport# %u  speed %u Mbps\n"
+               "\tport# %u  speed %s\n"
                "\tRX packets %" PRIu64"  bytes %" PRIu64"\n"
                "\tRX errors %" PRIu64"  missed %" PRIu64"  no-mbuf %" PRIu64"\n"
                "\tTX packets %" PRIu64"  bytes %" PRIu64"\n"
@@ -287,7 +287,7 @@ print_link_info(struct link *link, char *out, size_t out_size)
                link->n_rxq,
                link->n_txq,
                link->port_id,
-               eth_link.link_speed,
+               rte_eth_link_speed_to_str(eth_link.link_speed),
                stats.ipackets,
                stats.ibytes,
                stats.ierrors,
@@ -414,23 +414,23 @@ cmd_tmgr_subport_profile(char **tokens,
                return;
        }
 
-       if (parser_read_uint32(&p.tb_rate, tokens[3]) != 0) {
+       if (parser_read_uint64(&p.tb_rate, tokens[3]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tb_rate");
                return;
        }
 
-       if (parser_read_uint32(&p.tb_size, tokens[4]) != 0) {
+       if (parser_read_uint64(&p.tb_size, tokens[4]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tb_size");
                return;
        }
 
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
-               if (parser_read_uint32(&p.tc_rate[i], tokens[5 + i]) != 0) {
+               if (parser_read_uint64(&p.tc_rate[i], tokens[5 + i]) != 0) {
                        snprintf(out, out_size, MSG_ARG_INVALID, "tc_rate");
                        return;
                }
 
-       if (parser_read_uint32(&p.tc_period, tokens[18]) != 0) {
+       if (parser_read_uint64(&p.tc_period, tokens[18]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tc_period");
                return;
        }
@@ -487,23 +487,23 @@ cmd_tmgr_pipe_profile(char **tokens,
                return;
        }
 
-       if (parser_read_uint32(&p.tb_rate, tokens[3]) != 0) {
+       if (parser_read_uint64(&p.tb_rate, tokens[3]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tb_rate");
                return;
        }
 
-       if (parser_read_uint32(&p.tb_size, tokens[4]) != 0) {
+       if (parser_read_uint64(&p.tb_size, tokens[4]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tb_size");
                return;
        }
 
        for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++)
-               if (parser_read_uint32(&p.tc_rate[i], tokens[5 + i]) != 0) {
+               if (parser_read_uint64(&p.tc_rate[i], tokens[5 + i]) != 0) {
                        snprintf(out, out_size, MSG_ARG_INVALID, "tc_rate");
                        return;
                }
 
-       if (parser_read_uint32(&p.tc_period, tokens[18]) != 0) {
+       if (parser_read_uint64(&p.tc_period, tokens[18]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "tc_period");
                return;
        }
@@ -556,7 +556,7 @@ cmd_tmgr(char **tokens,
                return;
        }
 
-       if (parser_read_uint32(&p.rate, tokens[3]) != 0) {
+       if (parser_read_uint64(&p.rate, tokens[3]) != 0) {
                snprintf(out, out_size, MSG_ARG_INVALID, "rate");
                return;
        }
@@ -2671,7 +2671,7 @@ struct pkt_key_qinq {
        uint16_t svlan;
        uint16_t ethertype_cvlan;
        uint16_t cvlan;
-} __attribute__((__packed__));
+} __rte_packed;
 
 struct pkt_key_ipv4_5tuple {
        uint8_t time_to_live;
@@ -2681,7 +2681,7 @@ struct pkt_key_ipv4_5tuple {
        uint32_t da;
        uint16_t sp;
        uint16_t dp;
-} __attribute__((__packed__));
+} __rte_packed;
 
 struct pkt_key_ipv6_5tuple {
        uint16_t payload_length;
@@ -2691,15 +2691,15 @@ struct pkt_key_ipv6_5tuple {
        uint8_t da[16];
        uint16_t sp;
        uint16_t dp;
-} __attribute__((__packed__));
+} __rte_packed;
 
 struct pkt_key_ipv4_addr {
        uint32_t addr;
-} __attribute__((__packed__));
+} __rte_packed;
 
 struct pkt_key_ipv6_addr {
        uint8_t addr[16];
-} __attribute__((__packed__));
+} __rte_packed;
 
 static uint32_t
 parse_match(char **tokens,