Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / net / ipv4 / tcp.c

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d2ca56a..21bdee8 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1734,6 +1734,50 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
 }
 EXPORT_SYMBOL(tcp_read_sock);
 
+int tcp_read_skb(struct sock *sk, skb_read_actor_t recv_actor)
+{
+       struct tcp_sock *tp = tcp_sk(sk);
+       u32 seq = tp->copied_seq;
+       struct sk_buff *skb;
+       int copied = 0;
+       u32 offset;
+
+       if (sk->sk_state == TCP_LISTEN)
+               return -ENOTCONN;
+
+       while ((skb = tcp_recv_skb(sk, seq, &offset)) != NULL) {
+               int used;
+
+               __skb_unlink(skb, &sk->sk_receive_queue);
+               used = recv_actor(sk, skb);
+               if (used <= 0) {
+                       if (!copied)
+                               copied = used;
+                       break;
+               }
+               seq += used;
+               copied += used;
+
+               if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) {
+                       consume_skb(skb);
+                       ++seq;
+                       break;
+               }
+               consume_skb(skb);
+               break;
+       }
+       WRITE_ONCE(tp->copied_seq, seq);
+
+       tcp_rcv_space_adjust(sk);
+
+       /* Clean up data we have read: This will do ACK frames. */
+       if (copied > 0)
+               tcp_cleanup_rbuf(sk, copied);
+
+       return copied;
+}
+EXPORT_SYMBOL(tcp_read_skb);
+
 int tcp_peek_len(struct socket *sock)
 {
        return tcp_inq(sock->sk);