From 299191e0c9ba560a9d0f92cf75f7e9660ac8f1e2 Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Thu, 29 Jan 2015 13:29:16 +0800 Subject: [PATCH] ethdev: remove flexbytes offset from flow director This patch removes the flexbytes_offset from rte_fdir_conf, because the flexible payload setting is done by flex_conf instead of flexbytes_offset. Signed-off-by: Jingjing Wu Acked-by: Helin Zhang --- app/test-pmd/parameters.c | 16 ---------------- app/test-pmd/testpmd.c | 1 - app/test/test_link_bonding.c | 1 - lib/librte_ether/rte_ethdev.h | 2 -- 4 files changed, 20 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 19fbf461f5..473f82433d 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -145,10 +145,6 @@ usage(char* progname) "(N: none or match (default) or always).\n"); printf(" --pkt-filter-size=N: set Flow Director mode " "(N: 64K (default mode) or 128K or 256K).\n"); - printf(" --pkt-filter-flexbytes-offset=N: set flexbytes-offset. " - "The offset is defined in word units counted from the " - "first byte of the destination Ethernet MAC address. " - "0 <= N <= 32.\n"); printf(" --pkt-filter-drop-queue=N: set drop-queue. " "In perfect mode, when you add a rule with queue = -1 " "the packet will be enqueued into the rx drop-queue. " @@ -517,7 +513,6 @@ launch_args_parse(int argc, char** argv) { "pkt-filter-mode", 1, 0, 0 }, { "pkt-filter-report-hash", 1, 0, 0 }, { "pkt-filter-size", 1, 0, 0 }, - { "pkt-filter-flexbytes-offset",1, 0, 0 }, { "pkt-filter-drop-queue", 1, 0, 0 }, { "crc-strip", 0, 0, 0 }, { "enable-rx-cksum", 0, 0, 0 }, @@ -740,17 +735,6 @@ launch_args_parse(int argc, char** argv) " must be: 64K or 128K or 256K\n", optarg); } - if (!strcmp(lgopts[opt_idx].name, - "pkt-filter-flexbytes-offset")) { - n = atoi(optarg); - if ( n >= 0 && n <= (int) 32) - fdir_conf.flexbytes_offset = - (uint8_t) n; - else - rte_exit(EXIT_FAILURE, - "flexbytes %d invalid - must" - "be >= 0 && <= 32\n", n); - } if (!strcmp(lgopts[opt_idx].name, "pkt-filter-drop-queue")) { n = atoi(optarg); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 3aebea60e5..69fa9d3a6a 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -286,7 +286,6 @@ struct rte_fdir_conf fdir_conf = { .mode = RTE_FDIR_MODE_NONE, .pballoc = RTE_FDIR_PBALLOC_64K, .status = RTE_FDIR_REPORT_STATUS, - .flexbytes_offset = 0x6, .drop_queue = 127, }; diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c index 7adc6da64f..0f743fccdb 100644 --- a/app/test/test_link_bonding.c +++ b/app/test/test_link_bonding.c @@ -182,7 +182,6 @@ struct rte_fdir_conf fdir_conf = { .mode = RTE_FDIR_MODE_NONE, .pballoc = RTE_FDIR_PBALLOC_64K, .status = RTE_FDIR_REPORT_STATUS, - .flexbytes_offset = 0x6, .drop_queue = 127, }; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index fd8451aeab..9cfe6e505c 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -721,8 +721,6 @@ struct rte_fdir_conf { enum rte_fdir_mode mode; /**< Flow Director mode. */ enum rte_fdir_pballoc_type pballoc; /**< Space for FDIR filters. */ enum rte_fdir_status_mode status; /**< How to report FDIR hash. */ - /** Offset of flexbytes field in RX packets (in 16-bit word units). */ - uint8_t flexbytes_offset; /** RX queue of packets matching a "drop" filter in perfect mode. */ uint8_t drop_queue; struct rte_eth_fdir_flex_conf flex_conf; -- 2.20.1