summaryrefslogtreecommitdiffstats
path: root/drivers/net/tap.c
diff options
context:
space:
mode:
authorJonathan Lemon <jonathan.lemon@gmail.com>2021-01-06 23:18:34 +0100
committerJakub Kicinski <kuba@kernel.org>2021-01-08 01:06:37 +0100
commit36177832f42d9c7b222ab039678398a9d4070fff (patch)
tree3754cf136b706af72f461bf3b6fadadd3acc555c /drivers/net/tap.c
parentskbuff: replace sock_zerocopy_get with skb_zcopy_get (diff)
downloadlinux-36177832f42d9c7b222ab039678398a9d4070fff.tar.xz
linux-36177832f42d9c7b222ab039678398a9d4070fff.zip
skbuff: Add skb parameter to the ubuf zerocopy callback
Add an optional skb parameter to the zerocopy callback parameter, which is passed down from skb_zcopy_clear(). This gives access to the original skb, which is needed for upcoming RX zero-copy error handling. Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/tap.c')
-rw-r--r--drivers/net/tap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 1f4bdd94407a..3f51f3766d18 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -727,7 +727,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
} else if (msg_control) {
struct ubuf_info *uarg = msg_control;
- uarg->callback(uarg, false);
+ uarg->callback(NULL, uarg, false);
}
if (tap) {