From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id C19BE6835 for ; Thu, 30 Oct 2014 03:02:29 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 29 Oct 2014 19:05:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="408216694" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by FMSMGA003.fm.intel.com with ESMTP; 29 Oct 2014 19:03:14 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id s9U2BJGv010813; Thu, 30 Oct 2014 10:11:19 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id s9U2BHNt003300; Thu, 30 Oct 2014 10:11:19 +0800 Received: (from couyang@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s9U2BHLw003296; Thu, 30 Oct 2014 10:11:17 +0800 From: Ouyang Changchun To: dev@dpdk.org Date: Thu, 30 Oct 2014 10:11:16 +0800 Message-Id: <1414635076-3267-1-git-send-email-changchun.ouyang@intel.com> X-Mailer: git-send-email 1.7.12.2 Subject: [dpdk-dev] [PATCH] vhost: Remove the check between mergeable and vector pmd X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2014 02:02:30 -0000 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 --- examples/vhost/main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/vhost/main.c b/examples/vhost/main.c index 291128e..57ef464 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)) -- 1.8.4.2