diff mbox

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

Message ID 1415520822-11922-1-git-send-email-ogerlitz@mellanox.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Or Gerlitz Nov. 9, 2014, 8:13 a.m. UTC
The networking core does it for the driver during registration time.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---

changes from v0:
 - set alignment to be per the request of Matthew Vick


 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

Comments

Kirsher, Jeffrey T Nov. 11, 2014, 8:25 a.m. UTC | #1
On Sun, 2014-11-09 at 10:13 +0200, Or Gerlitz wrote:
> The networking core does it for the driver during registration time.
> 
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> ---
> 
> changes from v0:
>  - set alignment to be per the request of Matthew Vick
> 
> 
>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |   13 ++++++-------
>  1 files changed, 6 insertions(+), 7 deletions(-)

Thanks Or, I have added your patch to my queue.
Vick, Matthew Nov. 11, 2014, 4:37 p.m. UTC | #2
On 11/9/14, 12:13 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>
>---
>
>changes from v0:
> - set alignment to be per the request of Matthew Vick

Thanks Or! I'll add my ACK as this passes through Jeff's queue.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 8811364..14882dc 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 |
-			       NETIF_F_TSO |
-			       NETIF_F_TSO6 |
-			       NETIF_F_TSO_ECN |
-			       NETIF_F_GSO_UDP_TUNNEL |
-			       NETIF_F_IPV6_CSUM |
-			       NETIF_F_SG;
+	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;
 
 	/* we want to leave these both on as we cannot disable VLAN tag
 	 * insertion or stripping on the hardware since it is contained