Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 09d45d718973398918879d1321000ca82cdf1e3d..b14266bb91eb5e3b1f43f3329dc2510c8be26a19 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1799,10 +1799,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
                                sk->sk_rx_dst = NULL;
                        }
                }
-               if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
-                       rsk = sk;
-                       goto reset;
-               }
+               tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);
                return 0;
        }