diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-17 03:13:19 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-17 03:13:19 +0300 |
| commit | 7cd2802d7496c1fc76f42dc045b48cc16d11df39 (patch) | |
| tree | 41c33f5944bbc686a489801762eb126e07049b81 /drivers/net/virtio_net.c | |
| parent | 0f473bb6ed2d0b8533a079ee133f625f83de5315 (diff) | |
| parent | 6441998e2e37131b0a4c310af9156d79d3351c16 (diff) | |
| download | linux-7cd2802d7496c1fc76f42dc045b48cc16d11df39.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 088d9404c93d..87f8c896238f 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -733,7 +733,7 @@ static struct sk_buff *receive_small(struct net_device *dev, pr_debug("%s: rx error: len %u exceeds max size %d\n", dev->name, len, GOOD_PACKET_LEN); dev->stats.rx_length_errors++; - goto err_len; + goto err; } if (likely(!vi->xdp_enabled)) { @@ -825,10 +825,8 @@ static struct sk_buff *receive_small(struct net_device *dev, skip_xdp: skb = build_skb(buf, buflen); - if (!skb) { - put_page(page); + if (!skb) goto err; - } skb_reserve(skb, headroom - delta); skb_put(skb, len); if (!xdp_prog) { @@ -839,13 +837,12 @@ skip_xdp: if (metasize) skb_metadata_set(skb, metasize); -err: return skb; err_xdp: rcu_read_unlock(); stats->xdp_drops++; -err_len: +err: stats->drops++; put_page(page); xdp_xmit: |