On Wed, Mar 23, 2016 at 12:35 PM, Jesse Gross <je...@kernel.org> wrote: > On Fri, Mar 18, 2016 at 4:25 PM, Alexander Duyck <adu...@mirantis.com> wrote: >> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c >> b/drivers/net/ethernet/intel/i40e/i40e_main.c >> index 39b0009253c2..ac3964a9f5c0 100644 >> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c >> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c >> @@ -9074,7 +9075,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) >> if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) >> netdev->features |= NETIF_F_NTUPLE; >> if (pf->flags & I40E_FLAG_OUTER_UDP_CSUM_CAPABLE) >> - netdev->features |= NETIF_F_GSO_UDP_TUNNEL_CSUM; >> + netdev->features = NETIF_F_GSO_UDP_TUNNEL_CSUM; > > Looks like there might be a typo - I guess this is supposed to still > OR with the previous features instead of replacing them?
Yes, that was a typo. It looks like I got it right on the i40vf half of the patch but didn't get it correct here. Thanks for catching that, I'll have it fixed for when I push it for net-next. - Alex