diff options
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 0db14f6b87d3..8e9f4cfe941f 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2761,7 +2761,7 @@ static void virtnet_init_default_rss(struct virtnet_info *vi)  		vi->ctrl->rss.indirection_table[i] = indir_val;  	} -	vi->ctrl->rss.max_tx_vq = vi->curr_queue_pairs; +	vi->ctrl->rss.max_tx_vq = vi->has_rss ? vi->curr_queue_pairs : 0;  	vi->ctrl->rss.hash_key_length = vi->rss_key_size;  	netdev_rss_key_fill(vi->ctrl->rss.key, vi->rss_key_size); @@ -4231,6 +4231,8 @@ static int virtnet_probe(struct virtio_device *vdev)  	virtio_device_ready(vdev); +	_virtnet_set_queues(vi, vi->curr_queue_pairs); +  	/* a random MAC address has been assigned, notify the device.  	 * We don't fail probe if VIRTIO_NET_F_CTRL_MAC_ADDR is not there  	 * because many devices work fine without getting MAC explicitly @@ -4257,8 +4259,6 @@ static int virtnet_probe(struct virtio_device *vdev)  		goto free_unregister_netdev;  	} -	virtnet_set_queues(vi, vi->curr_queue_pairs); -  	/* Assume link up if device can't report link status,  	   otherwise get link status from config. */  	netif_carrier_off(dev);  | 
