aboutsummaryrefslogtreecommitdiff
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2024-07-02 12:06:52 +0200
committerPaolo Abeni <pabeni@redhat.com>2024-07-02 12:06:52 +0200
commite2dd0d0593c17f32c7263e9d6f7554ecaabb0baf (patch)
tree49d28d7d73115a7f25d5e52cac07fda75a117dbd /include/linux/socket.h
parent19e6ad2c75782bd15b3df24df7982da457d702c5 (diff)
parent2ca58ed21cefdda45520a0a2b1980c008efe9874 (diff)
Merge branch 'zerocopy-tx-cleanups'
Pavel Begunkov says: ==================== zerocopy tx cleanups Assorted zerocopy send path cleanups, the main part of which is moving some net stack specific accounting out of io_uring back to net/ in Patch 4. ==================== Link: https://patch.msgid.link/cover.1719190216.git.asml.silence@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'include/linux/socket.h')
-rw-r--r--include/linux/socket.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 89d16b90370b..2a1ff91d1914 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -76,7 +76,7 @@ struct msghdr {
__kernel_size_t msg_controllen; /* ancillary data buffer length */
struct kiocb *msg_iocb; /* ptr to iocb for async requests */
struct ubuf_info *msg_ubuf;
- int (*sg_from_iter)(struct sock *sk, struct sk_buff *skb,
+ int (*sg_from_iter)(struct sk_buff *skb,
struct iov_iter *from, size_t length);
};