diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-07 22:01:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-07 22:01:52 +0200 |
| commit | 126285651b7f95282a0afe3a1b0221419b31d989 (patch) | |
| tree | e5d547255814a5ed55b6b74be3155464598b39f2 /drivers/net/virtio_net.c | |
| parent | sch_htb: fix doc warning in htb_lookup_leaf() (diff) | |
| parent | cxgb4: avoid link re-train during TC-MQPRIO configuration (diff) | |
| download | linux-126285651b7f95282a0afe3a1b0221419b31d989.tar.xz linux-126285651b7f95282a0afe3a1b0221419b31d989.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net
Bug fixes overlapping feature additions and refactoring, mostly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ed969b65126e..f8f5b8646a43 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -401,6 +401,9 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi, /* If whole_page, there is an offset between the beginning of the * data and the allocated space, otherwise the data and the allocated * space are aligned. + * + * Buffers with headroom use PAGE_SIZE as alloc size, see + * add_recvbuf_mergeable() + get_mergeable_buf_len() */ if (whole_page) { /* Buffers with whole_page use PAGE_SIZE as alloc size, |