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

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>

diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c
index a284205b8ecf9b1fc5ae57cd9428786d57a31393..0d085f5cf1bfb375622c6556bf4f8aae2514e02d 100644 (file)
--- a/net/rxrpc/recvmsg.c
+++ b/net/rxrpc/recvmsg.c
@@ -240,9 +240,6 @@ static int rxrpc_locate_data(struct rxrpc_call *call, struct sk_buff *skb,
        int ret;
        u8 annotation = *_annotation;
 
-       if (offset > 0)
-               return 0;
-
        /* Locate the subpacket */
        offset = 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)
                        sock_recv_timestamp(msg, sock->sk, skb);
 
-               ret = rxrpc_locate_data(call, skb, &call->rxtx_annotations[ix],
-                                       &rx_pkt_offset, &rx_pkt_len);
+               if (rx_pkt_offset == 0)
+                       ret = rxrpc_locate_data(call, skb,
+                                               &call->rxtx_annotations[ix],
+                                               &rx_pkt_offset, &rx_pkt_len);
                _debug("recvmsg %x DATA #%u { %d, %d }",
                       sp->hdr.callNumber, seq, rx_pkt_offset, rx_pkt_len);