Commit c080559a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-make-udp-tunnel-devices-support-fraglist' 

Xin Long says:

====================
net: make udp tunnel devices support fraglist

Like GRE device, UDP tunnel devices should also support fraglist, so
that some protocol (like SCTP) HW GSO that requires NETIF_F_FRAGLIST
in the dev can work. Especially when the lower device support both
NETIF_F_GSO_UDP_TUNNEL and NETIF_F_GSO_SCTP.
====================

Link: https://lore.kernel.org/r/cover.1610704037.git.lucien.xin@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 505e3f00 3224dcfd

drivers/net/bareudp.c

+3 −2
Original line number Diff line number Diff line
@@ -532,11 +532,12 @@ static void bareudp_setup(struct net_device *dev) 
	dev->netdev_ops = &bareudp_netdev_ops;

	dev->needs_free_netdev = true;

	SET_NETDEV_DEVTYPE(dev, &bareudp_type);

	dev->features    |= NETIF_F_SG | NETIF_F_HW_CSUM;

	dev->features    |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;

	dev->features    |= NETIF_F_RXCSUM;

	dev->features    |= NETIF_F_LLTX;

	dev->features    |= NETIF_F_GSO_SOFTWARE;

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

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

	dev->hw_features |= NETIF_F_RXCSUM;

	dev->hw_features |= NETIF_F_GSO_SOFTWARE;

	dev->hard_header_len = 0;

	dev->addr_len = 0;

drivers/net/geneve.c

+3 −2
Original line number Diff line number Diff line
@@ -1197,11 +1197,12 @@ static void geneve_setup(struct net_device *dev) 
	SET_NETDEV_DEVTYPE(dev, &geneve_type);



	dev->features    |= NETIF_F_LLTX;

	dev->features    |= NETIF_F_SG | NETIF_F_HW_CSUM;

	dev->features    |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;

	dev->features    |= NETIF_F_RXCSUM;

	dev->features    |= NETIF_F_GSO_SOFTWARE;



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

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

	dev->hw_features |= NETIF_F_RXCSUM;

	dev->hw_features |= NETIF_F_GSO_SOFTWARE;



	/* MTU range: 68 - (something less than 65535) */

drivers/net/vxlan.c

+3 −2
Original line number Diff line number Diff line
@@ -3283,12 +3283,13 @@ static void vxlan_setup(struct net_device *dev) 
	SET_NETDEV_DEVTYPE(dev, &vxlan_type);



	dev->features	|= NETIF_F_LLTX;

	dev->features	|= NETIF_F_SG | NETIF_F_HW_CSUM;

	dev->features	|= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;

	dev->features   |= NETIF_F_RXCSUM;

	dev->features   |= NETIF_F_GSO_SOFTWARE;



	dev->vlan_features = dev->features;

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

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

	dev->hw_features |= NETIF_F_RXCSUM;

	dev->hw_features |= NETIF_F_GSO_SOFTWARE;

	netif_keep_dst(dev);

	dev->priv_flags |= IFF_NO_QUEUE;