Revert "virtio_net: Fix napi_skb_cache_put warning"
This reverts commit a5315ef480
.
This commit is contained in:
parent
8a0aebb9d1
commit
179a92ca0d
1 changed files with 4 additions and 4 deletions
|
@ -1497,7 +1497,7 @@ static bool is_xdp_raw_buffer_queue(struct virtnet_info *vi, int q)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void virtnet_poll_cleantx(struct receive_queue *rq, int budget)
|
static void virtnet_poll_cleantx(struct receive_queue *rq)
|
||||||
{
|
{
|
||||||
struct virtnet_info *vi = rq->vq->vdev->priv;
|
struct virtnet_info *vi = rq->vq->vdev->priv;
|
||||||
unsigned int index = vq2rxq(rq->vq);
|
unsigned int index = vq2rxq(rq->vq);
|
||||||
|
@ -1508,7 +1508,7 @@ static void virtnet_poll_cleantx(struct receive_queue *rq, int budget)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (__netif_tx_trylock(txq)) {
|
if (__netif_tx_trylock(txq)) {
|
||||||
free_old_xmit_skbs(sq, !!budget);
|
free_old_xmit_skbs(sq, true);
|
||||||
__netif_tx_unlock(txq);
|
__netif_tx_unlock(txq);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1525,7 +1525,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
|
||||||
unsigned int received;
|
unsigned int received;
|
||||||
unsigned int xdp_xmit = 0;
|
unsigned int xdp_xmit = 0;
|
||||||
|
|
||||||
virtnet_poll_cleantx(rq, budget);
|
virtnet_poll_cleantx(rq);
|
||||||
|
|
||||||
received = virtnet_receive(rq, budget, &xdp_xmit);
|
received = virtnet_receive(rq, budget, &xdp_xmit);
|
||||||
|
|
||||||
|
@ -1598,7 +1598,7 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
|
||||||
txq = netdev_get_tx_queue(vi->dev, index);
|
txq = netdev_get_tx_queue(vi->dev, index);
|
||||||
__netif_tx_lock(txq, raw_smp_processor_id());
|
__netif_tx_lock(txq, raw_smp_processor_id());
|
||||||
virtqueue_disable_cb(sq->vq);
|
virtqueue_disable_cb(sq->vq);
|
||||||
free_old_xmit_skbs(sq, !!budget);
|
free_old_xmit_skbs(sq, true);
|
||||||
|
|
||||||
opaque = virtqueue_enable_cb_prepare(sq->vq);
|
opaque = virtqueue_enable_cb_prepare(sq->vq);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue