On 08/18/2016 07:46 AM, Jianfeng Tan wrote: > When VMDQ is enabled, different NICs have different behaviors for > disabling VLAN strip. In detail, i40e only enables/disables it of > PF's main vsi; fm10k cannot disable VLAN strip, etc. We now remove > this option, --vlan-strip, to reduce any confusion. And now, VLAN > strip will be enabled and cannot be disabled. > > Reported-by: Qian Xu <qian.q.xu at intel.com> > Signed-off-by: Jianfeng Tan <jianfeng.tan at intel.com> > --- > doc/guides/sample_app_ug/vhost.rst | 11 ++++------- > examples/vhost/main.c | 26 +------------------------- > 2 files changed, 5 insertions(+), 32 deletions(-)
Minor comment below. Other than that: Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com> > diff --git a/doc/guides/sample_app_ug/vhost.rst > b/doc/guides/sample_app_ug/vhost.rst > index 2b7defc..a204f78 100644 > --- a/doc/guides/sample_app_ug/vhost.rst > +++ b/doc/guides/sample_app_ug/vhost.rst > @@ -496,13 +496,10 @@ due to the large and complex code, it's better to > redesign it than fixing > it to make it work again. Hence, zero copy may be added back later. > > **VLAN strip.** > -The VLAN strip option enable/disable the VLAN strip on host, if disabled, > the guest will receive the packets with VLAN tag. > -It is enabled by default. > - > -.. code-block:: console > - > - ./vhost-switch -c f -n 4 --socket-mem 1024 --huge-dir /mnt/huge \ > - -- --vlan-strip [0, 1] > +VLAN strip option is removed, because different NICs have different behaviors > +when disabling VLAN strip. Such feature, which heavily depends on hardware, > +should be removed from this example to deduce confusion. Now, VLAN strip is I'm not a native English speaker, but I would use "reduce" instead of "deduce" here. I might be wrong, so feel free to keep as-is if appropriate. Thanks, Maxime