diff mbox

[dpdk-dev] net/nfp: fix Vlan offload flags check

Message ID 1484226296-540-1-git-send-email-olivier.matz@6wind.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Olivier Matz Jan. 12, 2017, 1:04 p.m. UTC 
  Fix typo when checking that no Vlan offload flags are passed at port
initialization.

By the way, also fix a typo in the log.

Fixes: d4a27a3b092a ("nfp: add basic features")

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 drivers/net/nfp/nfp_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Alejandro Lucero Jan. 13, 2017, 11:36 a.m. UTC | #1 
Acked.

Thanks!

On Thu, Jan 12, 2017 at 1:04 PM, Olivier Matz <olivier.matz@6wind.com>
wrote:

> Fix typo when checking that no Vlan offload flags are passed at port
> initialization.
>
> By the way, also fix a typo in the log.
>
> Fixes: d4a27a3b092a ("nfp: add basic features")
>
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  drivers/net/nfp/nfp_net.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
> index 65ba09f..ed3c9b8 100644
> --- a/drivers/net/nfp/nfp_net.c
> +++ b/drivers/net/nfp/nfp_net.c
> @@ -2174,8 +2174,8 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev,
> int mask)
>         new_ctrl = 0;
>
>         if ((mask & ETH_VLAN_FILTER_OFFLOAD) ||
> -           (mask & ETH_VLAN_FILTER_OFFLOAD))
> -               RTE_LOG(INFO, PMD, "Not support for
> ETH_VLAN_FILTER_OFFLOAD or"
> +           (mask & ETH_VLAN_FILTER_EXTEND))
> +               RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD
> or"
>                         " ETH_VLAN_FILTER_EXTEND");
>
>         /* Enable vlan strip if it is not configured yet */
> --
> 2.8.1
>
>
Ferruh Yigit Jan. 13, 2017, 12:03 p.m. UTC | #2 
On 1/12/2017 1:04 PM, Olivier Matz wrote:
> Fix typo when checking that no Vlan offload flags are passed at port
> initialization.
> 
> By the way, also fix a typo in the log.
> 
> Fixes: d4a27a3b092a ("nfp: add basic features")
> 
> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> ---
>  drivers/net/nfp/nfp_net.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
> index 65ba09f..ed3c9b8 100644
> --- a/drivers/net/nfp/nfp_net.c
> +++ b/drivers/net/nfp/nfp_net.c
> @@ -2174,8 +2174,8 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)
>  	new_ctrl = 0;
>  
>  	if ((mask & ETH_VLAN_FILTER_OFFLOAD) ||
> -	    (mask & ETH_VLAN_FILTER_OFFLOAD))
> -		RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD or"
> +	    (mask & ETH_VLAN_FILTER_EXTEND))

I can't find "ETH_VLAN_FILTER_EXTEND",
do you mean "ETH_VLAN_EXTEND_OFFLOAD" ?

> +		RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
>  			" ETH_VLAN_FILTER_EXTEND");
>  
>  	/* Enable vlan strip if it is not configured yet */
>
Olivier Matz Jan. 13, 2017, 12:48 p.m. UTC | #3 
On Fri, 13 Jan 2017 12:03:01 +0000, Ferruh Yigit
<ferruh.yigit@intel.com> wrote:
> On 1/12/2017 1:04 PM, Olivier Matz wrote:
> > Fix typo when checking that no Vlan offload flags are passed at port
> > initialization.
> > 
> > By the way, also fix a typo in the log.
> > 
> > Fixes: d4a27a3b092a ("nfp: add basic features")
> > 
> > Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> > ---
> >  drivers/net/nfp/nfp_net.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
> > index 65ba09f..ed3c9b8 100644
> > --- a/drivers/net/nfp/nfp_net.c
> > +++ b/drivers/net/nfp/nfp_net.c
> > @@ -2174,8 +2174,8 @@ nfp_net_vlan_offload_set(struct rte_eth_dev
> > *dev, int mask) new_ctrl = 0;
> >  
> >  	if ((mask & ETH_VLAN_FILTER_OFFLOAD) ||
> > -	    (mask & ETH_VLAN_FILTER_OFFLOAD))
> > -		RTE_LOG(INFO, PMD, "Not support for
> > ETH_VLAN_FILTER_OFFLOAD or"
> > +	    (mask & ETH_VLAN_FILTER_EXTEND))  
> 
> I can't find "ETH_VLAN_FILTER_EXTEND",
> do you mean "ETH_VLAN_EXTEND_OFFLOAD" ?

Erf... I'm sorry, my mistake, I copy/pasted the log below without
verifying. I saw it while watching the code.

Yes I mean ETH_VLAN_EXTEND_OFFLOAD. By the way, it could even be
replaced ETH_VLAN_*_MASK, but it's the same value. For reference, here
are the definitions from rte_ethdev.h:

 /* Definitions used for VLAN Offload functionality */
 #define ETH_VLAN_STRIP_OFFLOAD   0x0001 /**< VLAN Strip  On/Off */
 #define ETH_VLAN_FILTER_OFFLOAD  0x0002 /**< VLAN Filter On/Off */
 #define ETH_VLAN_EXTEND_OFFLOAD  0x0004 /**< VLAN Extend On/Off */

 /* Definitions used for mask VLAN setting */
 #define ETH_VLAN_STRIP_MASK   0x0001 /**< VLAN Strip  setting mask */
 #define ETH_VLAN_FILTER_MASK  0x0002 /**< VLAN Filter  setting mask*/
 #define ETH_VLAN_EXTEND_MASK  0x0004 /**< VLAN Extend  setting mask*/


I'll submit another patch with ETH_VLAN_EXTEND_OFFLOAD.
Thanks Ferruh.

Olivier
Ferruh Yigit Jan. 13, 2017, 1:17 p.m. UTC | #4 
On 1/13/2017 12:48 PM, Olivier Matz wrote:
> On Fri, 13 Jan 2017 12:03:01 +0000, Ferruh Yigit
> <ferruh.yigit@intel.com> wrote:
>> On 1/12/2017 1:04 PM, Olivier Matz wrote:
>>> Fix typo when checking that no Vlan offload flags are passed at port
>>> initialization.
>>>
>>> By the way, also fix a typo in the log.
>>>
>>> Fixes: d4a27a3b092a ("nfp: add basic features")
>>>
>>> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
>>> ---

<...>

> 
> 
> I'll submit another patch with ETH_VLAN_EXTEND_OFFLOAD.

If this will be the only change, I can update it if you want:

-   (mask & ETH_VLAN_FILTER_OFFLOAD))
-       RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD or"
-                       " ETH_VLAN_FILTER_EXTEND");
+   (mask & ETH_VLAN_EXTEND_OFFLOAD))
+       RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
+                       " ETH_VLAN_EXTEND_OFFLOAD");

> Thanks Ferruh.
> 
> Olivier
>
Olivier Matz Jan. 13, 2017, 2:48 p.m. UTC | #5 
On Fri, 13 Jan 2017 13:17:17 +0000, Ferruh Yigit
<ferruh.yigit@intel.com> wrote:
> On 1/13/2017 12:48 PM, Olivier Matz wrote:
> > On Fri, 13 Jan 2017 12:03:01 +0000, Ferruh Yigit
> > <ferruh.yigit@intel.com> wrote:  
> >> On 1/12/2017 1:04 PM, Olivier Matz wrote:  
> >>> Fix typo when checking that no Vlan offload flags are passed at
> >>> port initialization.
> >>>
> >>> By the way, also fix a typo in the log.
> >>>
> >>> Fixes: d4a27a3b092a ("nfp: add basic features")
> >>>
> >>> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> >>> ---  
> 
> <...>
> 
> > 
> > 
> > I'll submit another patch with ETH_VLAN_EXTEND_OFFLOAD.  
> 
> If this will be the only change, I can update it if you want:
> 
> -   (mask & ETH_VLAN_FILTER_OFFLOAD))
> -       RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD
> or"
> -                       " ETH_VLAN_FILTER_EXTEND");
> +   (mask & ETH_VLAN_EXTEND_OFFLOAD))
> +       RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
> +                       " ETH_VLAN_EXTEND_OFFLOAD");
> 

Looks good to me, thank you.

Olivier
Alejandro Lucero Jan. 13, 2017, 2:57 p.m. UTC | #6 
I was assuming in my acked answer, that the patch had followed usual path
and automatic compilation did not fail.

But I forgot about the NFP PMD not being enabled by default :-)

Hopefully, this will change if this just sent patch is accepted:

http://www.dpdk.org/ml/archives/dev/2017-January/054890.html

By other hand, I have compiled the NFP PMD with this patch and it works.

So acked again.

Thanks


On Fri, Jan 13, 2017 at 2:48 PM, Olivier Matz <olivier.matz@6wind.com>
wrote:

> On Fri, 13 Jan 2017 13:17:17 +0000, Ferruh Yigit
> <ferruh.yigit@intel.com> wrote:
> > On 1/13/2017 12:48 PM, Olivier Matz wrote:
> > > On Fri, 13 Jan 2017 12:03:01 +0000, Ferruh Yigit
> > > <ferruh.yigit@intel.com> wrote:
> > >> On 1/12/2017 1:04 PM, Olivier Matz wrote:
> > >>> Fix typo when checking that no Vlan offload flags are passed at
> > >>> port initialization.
> > >>>
> > >>> By the way, also fix a typo in the log.
> > >>>
> > >>> Fixes: d4a27a3b092a ("nfp: add basic features")
> > >>>
> > >>> Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
> > >>> ---
> >
> > <...>
> >
> > >
> > >
> > > I'll submit another patch with ETH_VLAN_EXTEND_OFFLOAD.
> >
> > If this will be the only change, I can update it if you want:
> >
> > -   (mask & ETH_VLAN_FILTER_OFFLOAD))
> > -       RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD
> > or"
> > -                       " ETH_VLAN_FILTER_EXTEND");
> > +   (mask & ETH_VLAN_EXTEND_OFFLOAD))
> > +       RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
> > +                       " ETH_VLAN_EXTEND_OFFLOAD");
> >
>
> Looks good to me, thank you.
>
> Olivier
>
diff mbox

Patch

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 65ba09f..ed3c9b8 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2174,8 +2174,8 @@  nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 	new_ctrl = 0;
 
 	if ((mask & ETH_VLAN_FILTER_OFFLOAD) ||
-	    (mask & ETH_VLAN_FILTER_OFFLOAD))
-		RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD or"
+	    (mask & ETH_VLAN_FILTER_EXTEND))
+		RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
 			" ETH_VLAN_FILTER_EXTEND");
 
 	/* Enable vlan strip if it is not configured yet */