* [PATCH net-next] net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask
@ 2014-03-18 8:36 Or Gerlitz
2014-03-18 17:27 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Or Gerlitz @ 2014-03-18 8:36 UTC (permalink / raw)
To: davem; +Cc: netdev, jeffrey.t.kirsher, 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/i40e/i40e_main.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index c66a11e..3daaf20 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6578,10 +6578,9 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
np = netdev_priv(netdev);
np->vsi = vsi;
- netdev->hw_enc_features = NETIF_F_IP_CSUM |
+ netdev->hw_enc_features |= NETIF_F_IP_CSUM |
NETIF_F_GSO_UDP_TUNNEL |
- NETIF_F_TSO |
- NETIF_F_SG;
+ NETIF_F_TSO;
netdev->features = NETIF_F_SG |
NETIF_F_IP_CSUM |
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask
2014-03-18 8:36 [PATCH net-next] net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask Or Gerlitz
@ 2014-03-18 17:27 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-03-18 17:27 UTC (permalink / raw)
To: ogerlitz; +Cc: netdev, jeffrey.t.kirsher
From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Tue, 18 Mar 2014 10:36:45 +0200
> The networking core does it for the driver during registration time.
>
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-18 17:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-18 8:36 [PATCH net-next] net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask Or Gerlitz
2014-03-18 17:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).