leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rxrpc: Move the check of rx_pkt_offset from rxrpc_locate_data() to caller

Browse Source 
Move the check of rx_pkt_offset from rxrpc_locate_data() to the caller,
rxrpc_recvmsg_data(), so that it's more clear what's going on there.

Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells 2016-09-17 10:49:11 +01:00
parent fabf920180
commit 4b22457c06
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/rxrpc/recvmsg.c
View File

@ -240,9 +240,6 @@ static int rxrpc_locate_data(struct rxrpc_call *call, struct sk_buff *skb,
int ret; int ret;
u8 annotation = *_annotation; u8 annotation = *_annotation;
if (offset > 0)
return 0;
/* Locate the subpacket */ /* Locate the subpacket */
offset = sp->offset; offset = sp->offset;
len = skb->len - sp->offset; len = skb->len - sp->offset;
@ -303,8 +300,10 @@ static int rxrpc_recvmsg_data(struct socket *sock, struct rxrpc_call *call,
if (msg) if (msg)
sock_recv_timestamp(msg, sock->sk, skb); sock_recv_timestamp(msg, sock->sk, skb);
ret = rxrpc_locate_data(call, skb, &call->rxtx_annotations[ix], if (rx_pkt_offset == 0)
&rx_pkt_offset, &rx_pkt_len); ret = rxrpc_locate_data(call, skb,
&call->rxtx_annotations[ix],
&rx_pkt_offset, &rx_pkt_len);
_debug("recvmsg %x DATA #%u { %d, %d }", _debug("recvmsg %x DATA #%u { %d, %d }",
sp->hdr.callNumber, seq, rx_pkt_offset, rx_pkt_len); sp->hdr.callNumber, seq, rx_pkt_offset, rx_pkt_len);