diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2014-03-18 12:36:45 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-18 21:25:41 +0400 |
| commit | d70e941bff5f223017ba7001b8eb0423a636c070 (patch) | |
| tree | bb58e8a2fd5be409bc8bc61f3e5f800b853e0591 /drivers/net/ethernet | |
| parent | 37a622c1931d6fb41b30c308b4f077cb8696b16a (diff) | |
| download | linux-d70e941bff5f223017ba7001b8eb0423a636c070.tar.xz | |
net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation feature mask
The networking core does it for the driver during registration time.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | 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 c66a11e31e6f..3daaf205eabc 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 | |