[PATCH] vhost: Remove the check between mergeable and vector pmd

[PATCH] vhost: Remove the check between mergeable and vector pmd

[Ouyang Changchun]

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 <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 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

Re: [PATCH] vhost: Remove the check between mergeable and vector pmd

[Xie, Huawei]

Acked-by Huawei Xie <huawei.xie-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

> -----Original Message-----
> From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Ouyang Changchun
> Sent: Wednesday, October 29, 2014 7:11 PM
> To: dev-VfR2kkLFssw@public.gmane.org
> Subject: [dpdk-dev] [PATCH] vhost: Remove the check between mergeable and
> vector pmd
> 
> 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 <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  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

Re: [PATCH] vhost: Remove the check between mergeable and vector pmd

[Thomas Monjalon]

> From: Ouyang Changchun
> > 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 <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> Acked-by: Huawei Xie <huawei.xie-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Applied

Thanks
-- 
Thomas