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

Commit 5eb8f289 authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

geneve: remove vlan-related feature assignment 



The code handling vlan tag insertion was dropped in commit 371bd106
("geneve: Consolidate Geneve functionality in single module.").  Now we
need to drop the related vlan feature bits in the netdev structure.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Reviewed-by: default avatarJesse Gross <jesse@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a476bd6

drivers/net/geneve.c

+0 −4
Original line number Diff line number Diff line
@@ -748,12 +748,8 @@ static void geneve_setup(struct net_device *dev) 
	dev->features    |= NETIF_F_RXCSUM;

	dev->features    |= NETIF_F_GSO_SOFTWARE;



	dev->vlan_features = dev->features;

	dev->features    |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;



	dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;

	dev->hw_features |= NETIF_F_GSO_SOFTWARE;

	dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;



	netif_keep_dst(dev);

	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;