virtio_net: Remove references to NETIF_F_UFO. (e078de03) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/virtio_net.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2429,7 +2429,7 @@ static int virtnet_probe(struct virtio_device *vdev)
	dev->features \|= NETIF_F_HW_CSUM \| NETIF_F_SG;		dev->features \|= NETIF_F_HW_CSUM \| NETIF_F_SG;

	if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {		if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
	dev->hw_features \|= NETIF_F_TSO \| NETIF_F_UFO		dev->hw_features \|= NETIF_F_TSO
	\| NETIF_F_TSO_ECN \| NETIF_F_TSO6;		\| NETIF_F_TSO_ECN \| NETIF_F_TSO6;
	}		}
	/* Individual feature bits: what can host handle? */		/* Individual feature bits: what can host handle? */
	@@ -2439,13 +2439,11 @@ static int virtnet_probe(struct virtio_device *vdev)
	dev->hw_features \|= NETIF_F_TSO6;		dev->hw_features \|= NETIF_F_TSO6;
	if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))		if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))
	dev->hw_features \|= NETIF_F_TSO_ECN;		dev->hw_features \|= NETIF_F_TSO_ECN;
	if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_UFO))
	dev->hw_features \|= NETIF_F_UFO;

	dev->features \|= NETIF_F_GSO_ROBUST;		dev->features \|= NETIF_F_GSO_ROBUST;

	if (gso)		if (gso)
	dev->features \|= dev->hw_features & (NETIF_F_ALL_TSO\|NETIF_F_UFO);		dev->features \|= dev->hw_features & NETIF_F_ALL_TSO;
	/* (!csum && gso) case will be fixed by register_netdev() */		/* (!csum && gso) case will be fixed by register_netdev() */
	}		}
	if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))		if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))