diff options
| author | Erin MacNeil <[email protected]> | 2022-04-27 20:02:37 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-04-28 20:08:15 +0000 |
| commit | 6fd1d51cfa253b5ee7dae18d7cf1df830e9b6137 (patch) | |
| tree | a31571fbe97aecf0397022180c5f481f5a70636b /net/atm/common.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | kernel-6fd1d51cfa253b5ee7dae18d7cf1df830e9b6137.tar.gz kernel-6fd1d51cfa253b5ee7dae18d7cf1df830e9b6137.zip | |
net: SO_RCVMARK socket option for SO_MARK with recvmsg()
Adding a new socket option, SO_RCVMARK, to indicate that SO_MARK
should be included in the ancillary data returned by recvmsg().
Renamed the sock_recv_ts_and_drops() function to sock_recv_cmsgs().
Signed-off-by: Erin MacNeil <[email protected]>
Reviewed-by: Eric Dumazet <[email protected]>
Reviewed-by: David Ahern <[email protected]>
Acked-by: Marc Kleine-Budde <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/atm/common.c')
| -rw-r--r-- | net/atm/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index d0c8ab7ff8f6..f7019df41c3e 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -553,7 +553,7 @@ int vcc_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, error = skb_copy_datagram_msg(skb, 0, msg, copied); if (error) return error; - sock_recv_ts_and_drops(msg, sk, skb); + sock_recv_cmsgs(msg, sk, skb); if (!(flags & MSG_PEEK)) { pr_debug("%d -= %d\n", atomic_read(&sk->sk_rmem_alloc), |