diff --git a/[refs] b/[refs] index aaf5ba398cba..8df988c6ed3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba1cd541ecdaa659c5bf952659c4ad0d0707394d +refs/heads/master: ae8d7f884a24ee920e417077b2615c6862be687f diff --git a/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c index bda74e8aed7e..fc79e3416288 100644 --- a/trunk/net/ipv4/tcp_ipv4.c +++ b/trunk/net/ipv4/tcp_ipv4.c @@ -1593,7 +1593,7 @@ int tcp_v4_rcv(struct sk_buff *skb) #endif { if (!tcp_prequeue(sk, skb)) - ret = tcp_v4_do_rcv(sk, skb); + ret = tcp_v4_do_rcv(sk, skb); } } else sk_add_backlog(sk, skb);