diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2019-01-29 01:45:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-30 23:02:43 +0100 |
| commit | 188313c137c4f76afd0862f50dbc185b198b9e2a (patch) | |
| tree | ff24345c7eef2ed7e013a1385a7db33744545eb7 | |
| parent | virtio_net: Don't call free_old_xmit_skbs for xdp_frames (diff) | |
| download | linux-188313c137c4f76afd0862f50dbc185b198b9e2a.tar.xz linux-188313c137c4f76afd0862f50dbc185b198b9e2a.zip | |
virtio_net: Fix not restoring real_num_rx_queues
When _virtnet_set_queues() failed we did not restore real_num_rx_queues.
Fix this by placing the change of real_num_rx_queues after
_virtnet_set_queues().
This order is also in line with virtnet_set_channels().
Fixes: 4941d472bf95 ("virtio-net: do not reset during XDP set")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/virtio_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 046f955495a8..0e1a36908419 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2427,10 +2427,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, } } - netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp); err = _virtnet_set_queues(vi, curr_qp + xdp_qp); if (err) goto err; + netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp); vi->xdp_queue_pairs = xdp_qp; for (i = 0; i < vi->max_queue_pairs; i++) { |