Commit 2cfdf9fc authored Mar 01, 2015 by Eyal Birger Committed by David S. Miller Mar 02, 2015

net: rxrpc: change call to sock_recv_ts_and_drops() on rxrpc recvmsg to sock_recv_timestamp()



Commit 3b885787 ("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>

parent 6368c235

net/rxrpc/ar-recvmsg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */