[PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[Or Gerlitz]

The networking core does it for the driver during registration time.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 8811364..2b17cd8 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -1414,13 +1414,12 @@ struct net_device *fm10k_alloc_netdev(void)
 	dev->vlan_features |= dev->features;
 
 	/* configure tunnel offloads */
-	dev->hw_enc_features = NETIF_F_IP_CSUM |
+	dev->hw_enc_features |= NETIF_F_IP_CSUM |
 			       NETIF_F_TSO |
 			       NETIF_F_TSO6 |
 			       NETIF_F_TSO_ECN |
 			       NETIF_F_GSO_UDP_TUNNEL |
-			       NETIF_F_IPV6_CSUM |
-			       NETIF_F_SG;
+			       NETIF_F_IPV6_CSUM;
 
 	/* we want to leave these both on as we cannot disable VLAN tag
 	 * insertion or stripping on the hardware since it is contained
-- 
1.7.1

Re: [PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[David Miller]

From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Thu,  6 Nov 2014 11:21:04 +0200

> The networking core does it for the driver during registration time.
> 
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>

I assume Jeff will pick this up and send it to me via his tree.

Re: [PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 403 bytes --]

On Thu, 2014-11-06 at 16:44 -0500, David Miller wrote:
> From: Or Gerlitz <ogerlitz@mellanox.com>
> Date: Thu,  6 Nov 2014 11:21:04 +0200
> 
> > The networking core does it for the driver during registration time.
> > 
> > Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> 
> I assume Jeff will pick this up and send it to me via his tree.

Correct, I will add this to my queue of patches.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[Vick, Matthew]

On 11/6/14, 1:21 AM, "Or Gerlitz" <ogerlitz@mellanox.com> wrote:

>The networking core does it for the driver during registration time.
>
>Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
>---
> drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |    5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
>b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
>index 8811364..2b17cd8 100644
>--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
>+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
>@@ -1414,13 +1414,12 @@ struct net_device *fm10k_alloc_netdev(void)
> 	dev->vlan_features |= dev->features;
> 
> 	/* configure tunnel offloads */
>-	dev->hw_enc_features = NETIF_F_IP_CSUM |
>+	dev->hw_enc_features |= NETIF_F_IP_CSUM |
> 			       NETIF_F_TSO |
> 			       NETIF_F_TSO6 |
> 			       NETIF_F_TSO_ECN |
> 			       NETIF_F_GSO_UDP_TUNNEL |
>-			       NETIF_F_IPV6_CSUM |
>-			       NETIF_F_SG;
>+			       NETIF_F_IPV6_CSUM;
> 
> 	/* we want to leave these both on as we cannot disable VLAN tag
> 	 * insertion or stripping on the hardware since it is contained

Good catch, Or! Thank you for taking care of this!

Someone can correct me if I'm mistaken (I thought checkpatch would
complain about this, but it doesn't seem to be), but I believe the start
of the lines should match up like they are for the dev->features. Would
you like to submit a V2 with this change or would you like me to do it
(giving you credit via your Reported-by)?

Cheers,
Matthew

Re: [PATCH net-next] net/fm10k: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask

[Or Gerlitz]

On 11/7/2014 11:57 PM, Vick, Matthew wrote:
> Good catch, Or! Thank you for taking care of this!

sure
> Someone can correct me if I'm mistaken (I thought checkpatch would
> complain about this, but it doesn't seem to be), but I believe the start
> of the lines should match up like they are for the dev->features. Would
> you like to submit a V2 with this change or would you like me to do it
> (giving you credit via your Reported-by)?

I just submitted V1 along your request