diff options
| author |   Jonathan Lemon <jonathan.lemon@gmail.com> | 2021-01-06 14:18:34 -0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2021-01-07 16:06:37 -0800 |
| commit | 36177832f42d9c7b222ab039678398a9d4070fff (patch) | |
| tree | 3754cf136b706af72f461bf3b6fadadd3acc555c /drivers/net/xen-netback/netback.c | |
| parent | skbuff: replace sock_zerocopy_get with skb_zcopy_get (diff) | |
| download | wireguard-linux-36177832f42d9c7b222ab039678398a9d4070fff.tar.xz wireguard-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/xen-netback/netback.c')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index bc3421d14576..19a27dce79d2 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1091,7 +1091,7 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s uarg = skb_shinfo(skb)->destructor_arg; /* increase inflight counter to offset decrement in callback */ atomic_inc(&queue->inflight_packets); - uarg->callback(uarg, true); + uarg->callback(NULL, uarg, true); skb_shinfo(skb)->destructor_arg = NULL; /* Fill the skb with the new (local) frags. */ @@ -1228,7 +1228,8 @@ static int xenvif_tx_submit(struct xenvif_queue *queue) return work_done; } -void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success) +void xenvif_zerocopy_callback(struct sk_buff *skb, struct ubuf_info *ubuf, + bool zerocopy_success) { unsigned long flags; pending_ring_idx_t index; |