net/fm10k: 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>
Acked-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index 945b35d31c71338da374525bf09b58f25349949b..cfde8bac1aeb2a23e4c447f786e06394f3ce285e 100644 (file)
--- 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