D27918.1794698079.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D27918.1794698079.diff
View Options

	Index: sys/dev/virtio/network/if_vtnet.c
	===================================================================
	--- sys/dev/virtio/network/if_vtnet.c
	+++ sys/dev/virtio/network/if_vtnet.c
	@@ -610,7 +610,7 @@
	vtnet_negotiate_features(struct vtnet_softc *sc)
	{
	device_t dev;
	- uint64_t features;
	+ uint64_t features, negotiated_features;
	int no_csum;

	dev = sc->vtnet_dev;
	@@ -636,7 +636,7 @@
	features &= ~VIRTIO_NET_F_MQ;
	#endif

	- features = virtio_negotiate_features(dev, features);
	+ negotiated_features = virtio_negotiate_features(dev, features);

	if (virtio_with_feature(dev, VTNET_LRO_FEATURES) &&
	virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF) == 0) {
	@@ -654,12 +654,15 @@
	"LRO disabled since both mergeable buffers and "
	"indirect descriptors were not negotiated\n");
	features &= ~VTNET_LRO_FEATURES;
	- features = virtio_negotiate_features(dev, features);
	+ negotiated_features =
	+ virtio_negotiate_features(dev, features);
	} else
	sc->vtnet_flags \|= VTNET_FLAG_LRO_NOMRG;
	}

	- sc->vtnet_features = sc->vtnet_negotiated_features = features;
	+ sc->vtnet_features = negotiated_features;
	+ sc->vtnet_negotiated_features = negotiated_features;
	+
	virtio_finalize_features(dev);
	}