diff options
| author | Eyal Birger <eyal.birger@gmail.com> | 2015-03-01 14:58:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-02 00:19:29 -0500 |
| commit | 2cfdf9fcb85bf6c0bb4556384ba800b9f443f601 (patch) | |
| tree | 7a465e8f0cfb8cf26b4601348038e0a24bece904 /net/rxrpc | |
| parent | 6368c235777456ddaeaa61360186d8d03a61cb18 (diff) | |
| download | linux-stable-2cfdf9fcb85bf6c0bb4556384ba800b9f443f601.tar.gz linux-stable-2cfdf9fcb85bf6c0bb4556384ba800b9f443f601.tar.bz2 linux-stable-2cfdf9fcb85bf6c0bb4556384ba800b9f443f601.zip | |
net: rxrpc: change call to sock_recv_ts_and_drops() on rxrpc recvmsg to sock_recv_timestamp()
Commit 3b885787ea4112 ("net: Generalize socket rx gap / receive queue overflow cmsg")
allowed receiving packet dropcount information as a socket level option.
RXRPC sockets recvmsg function was changed to support this by calling
sock_recv_ts_and_drops() instead of sock_recv_timestamp().
However, protocol families wishing to receive dropcount should call
sock_queue_rcv_skb() or set the dropcount specifically (as done
in packet_rcv()). This was not done for rxrpc and thus this feature
never worked on these sockets.
Formalizing this by not calling sock_recv_ts_and_drops() in rxrpc as
part of an effort to move skb->dropcount into skb->cb[]
Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc')
| -rw-r--r-- | net/rxrpc/ar-recvmsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c index 4575485ad1b4..d58ba702bd2c 100644 --- a/net/rxrpc/ar-recvmsg.c +++ b/net/rxrpc/ar-recvmsg.c @@ -150,7 +150,7 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock, &call->conn->trans->peer->srx, len); msg->msg_namelen = len; } - sock_recv_ts_and_drops(msg, &rx->sk, skb); + sock_recv_timestamp(msg, &rx->sk, skb); } /* receive the message */ |