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

Commit a220871b authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

virtio-net: correctly enable multiqueue 



Commit 44900010 ("virtio-net: enable
multiqueue by default") blindly set the affinity instead of queues
during probe which can cause a mismatch of #queues between guest and
host. This patch fixes it by setting queues.

Reported-by: default avatarTheodore Ts'o <tytso@mit.edu>
Tested-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Fixes: 49000102901 ("virtio-net: enable multiqueue by default")
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fa3b6f9

drivers/net/virtio_net.c

+3 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,9 @@ static int virtnet_probe(struct virtio_device *vdev) 
		goto free_unregister_netdev;

	}



	virtnet_set_affinity(vi);

	rtnl_lock();

	virtnet_set_queues(vi, vi->curr_queue_pairs);

	rtnl_unlock();



	/* Assume link up if device can't report link status,

	   otherwise get link status from config. */