From 94cae38575e50d0a300db2dbec08e6807cfa95be Mon Sep 17 00:00:00 2001 From: Ouyang Changchun Date: Thu, 30 Oct 2014 10:11:16 +0800 Subject: [PATCH] examples/vhost: allow mergeable packets with vector ixgbe Since the commit 33e79bed3edc2bcf59 has fixed the issue in vector PMD, and then it can receive jumbo frame by scatter-gather mode, so remove this check. Signed-off-by: Changchun Ouyang Acked-by: Huawei Xie --- examples/vhost/main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 291128e036..57ef464884 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -2863,13 +2863,6 @@ MAIN(int argc, char *argv[]) ret = us_vhost_parse_args(argc, argv); if (ret < 0) rte_exit(EXIT_FAILURE, "Invalid argument\n"); -#ifdef RTE_IXGBE_INC_VECTOR - if (mergeable == 1) { - rte_exit(EXIT_FAILURE, - "sorry, mergeable feature doesn't work with vec sg recv, " \ - "please disable it in cfg as a workaround\n"); - } -#endif for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id ++) if (rte_lcore_is_enabled(lcore_id)) -- 2.20.1