net: add rte prefix to ether structures

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

diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index ce91e8a..7b8e7c4 100644 (file)
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -45,7 +45,7 @@ struct rte_flow *flow;
 #include "flow_blocks.c"
 
 static inline void
-print_ether_addr(const char *what, struct ether_addr *eth_addr)
+print_ether_addr(const char *what, struct rte_ether_addr *eth_addr)
 {
        char buf[ETHER_ADDR_FMT_SIZE];
        ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr);
@@ -56,7 +56,7 @@ static void
 main_loop(void)
 {
        struct rte_mbuf *mbufs[32];
-       struct ether_hdr *eth_hdr;
+       struct rte_ether_hdr *eth_hdr;
        struct rte_flow_error error;
        uint16_t nb_rx;
        uint16_t i;
@@ -71,7 +71,7 @@ main_loop(void)
                                        struct rte_mbuf *m = mbufs[j];
 
                                        eth_hdr = rte_pktmbuf_mtod(m,
-                                                       struct ether_hdr *);
+                                                       struct rte_ether_hdr *);
                                        print_ether_addr("src=",
                                                        &eth_hdr->s_addr);
                                        print_ether_addr(" - dst=",
@@ -121,7 +121,6 @@ init_port(void)
        struct rte_eth_conf port_conf = {
                .rxmode = {
                        .split_hdr_size = 0,
-                       .offloads = DEV_RX_OFFLOAD_CRC_STRIP,
                },
                .txmode = {
                        .offloads =
@@ -132,27 +131,13 @@ init_port(void)
                                DEV_TX_OFFLOAD_SCTP_CKSUM  |
                                DEV_TX_OFFLOAD_TCP_TSO,
                },
-               /*
-                * Initialize fdir_conf of rte_eth_conf.
-                * Fdir is used in flow filtering for I40e,
-                * so rte_flow rules involve some fdir
-                * configurations. In long term it's better
-                * that drivers don't require any fdir
-                * configuration for rte_flow, but we need to
-                * get this workaround so that sample app can
-                * run on I40e.
-                */
-               .fdir_conf = {
-                       .mode = RTE_FDIR_MODE_PERFECT,
-                       .pballoc = RTE_FDIR_PBALLOC_64K,
-                       .status = RTE_FDIR_REPORT_STATUS,
-                       .drop_queue = 127,
-               },
        };
        struct rte_eth_txconf txq_conf;
        struct rte_eth_rxconf rxq_conf;
        struct rte_eth_dev_info dev_info;
 
+       rte_eth_dev_info_get(port_id, &dev_info);
+       port_conf.txmode.offloads &= dev_info.tx_offload_capa;
        printf(":: initializing port: %d\n", port_id);
        ret = rte_eth_dev_configure(port_id,
                                nr_queues, nr_queues, &port_conf);
@@ -162,7 +147,6 @@ init_port(void)
                        ret, port_id);
        }
 
-       rte_eth_dev_info_get(port_id, &dev_info);
        rxq_conf = dev_info.default_rxconf;
        rxq_conf.offloads = port_conf.rxmode.offloads;
        /* only set Rx queues: something we care only so far */