net: add rte prefix to ether defines

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

diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index ca0e9e8..ce1f63d 100644 (file)
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -54,10 +54,9 @@ static struct rte_mempool *pool = NULL;
 static struct rte_eth_conf port_conf = {
        .rxmode = {
                .mq_mode        = ETH_MQ_RX_RSS,
-               .max_rx_pkt_len = ETHER_MAX_LEN,
+               .max_rx_pkt_len = RTE_ETHER_MAX_LEN,
                .split_hdr_size = 0,
-               .offloads = (DEV_RX_OFFLOAD_CHECKSUM |
-                            DEV_RX_OFFLOAD_CRC_STRIP),
+               .offloads = DEV_RX_OFFLOAD_CHECKSUM,
        },
        .rx_adv_conf = {
                .rss_conf = {
@@ -146,7 +145,8 @@ app_pkt_handle(struct rte_mbuf *pkt, uint64_t time)
 {
        uint8_t input_color, output_color;
        uint8_t *pkt_data = rte_pktmbuf_mtod(pkt, uint8_t *);
-       uint32_t pkt_len = rte_pktmbuf_pkt_len(pkt) - sizeof(struct ether_hdr);
+       uint32_t pkt_len = rte_pktmbuf_pkt_len(pkt) -
+               sizeof(struct rte_ether_hdr);
        uint8_t flow_id = (uint8_t)(pkt_data[APP_PKT_FLOW_POS] & (APP_FLOWS_MAX - 1));
        input_color = pkt_data[APP_PKT_COLOR_POS];
        enum policer_action action;
@@ -332,6 +332,17 @@ main(int argc, char **argv)
        rte_eth_dev_info_get(port_rx, &dev_info);
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+       conf.rx_adv_conf.rss_conf.rss_hf &= dev_info.flow_type_rss_offloads;
+       if (conf.rx_adv_conf.rss_conf.rss_hf !=
+                       port_conf.rx_adv_conf.rss_conf.rss_hf) {
+               printf("Port %u modified RSS hash function based on hardware support,"
+                       "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                       port_rx,
+                       port_conf.rx_adv_conf.rss_conf.rss_hf,
+                       conf.rx_adv_conf.rss_conf.rss_hf);
+       }
+
        ret = rte_eth_dev_configure(port_rx, 1, 1, &conf);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d configuration error (%d)\n", port_rx, ret);
@@ -361,6 +372,17 @@ main(int argc, char **argv)
        rte_eth_dev_info_get(port_tx, &dev_info);
        if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                conf.txmode.offloads |= DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+       conf.rx_adv_conf.rss_conf.rss_hf &= dev_info.flow_type_rss_offloads;
+       if (conf.rx_adv_conf.rss_conf.rss_hf !=
+                       port_conf.rx_adv_conf.rss_conf.rss_hf) {
+               printf("Port %u modified RSS hash function based on hardware support,"
+                       "requested:%#"PRIx64" configured:%#"PRIx64"\n",
+                       port_tx,
+                       port_conf.rx_adv_conf.rss_conf.rss_hf,
+                       conf.rx_adv_conf.rss_conf.rss_hf);
+       }
+
        ret = rte_eth_dev_configure(port_tx, 1, 1, &conf);
        if (ret < 0)
                rte_exit(EXIT_FAILURE, "Port %d configuration error (%d)\n", port_tx, ret);