Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2929e45 authored by Or Gerlitz's avatar Or Gerlitz Committed by Jeff Kirsher
Browse files

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: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Acked-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 720db4ff

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+6 −7
Original line number Diff line number Diff line
@@ -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