diff options
| author | Vijay Subramanian <subramanian.vijay@gmail.com> | 2013-09-03 12:23:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:28 -0400 |
| commit | c995ae2259ee36caf48bbfacf40111998dacd4af (patch) | |
| tree | dbe9be79766ab1c2a4f9da7ae461bd6ceab6bc9f /net/ipv4/tcp_ipv4.c | |
| parent | cc8c6c1b21c9b1e0f1e89428c07c7c52435cba0c (diff) | |
| download | talos-op-linux-c995ae2259ee36caf48bbfacf40111998dacd4af.tar.gz talos-op-linux-c995ae2259ee36caf48bbfacf40111998dacd4af.zip | |
tcp: Change return value of tcp_rcv_established()
tcp_rcv_established() returns only one value namely 0. We change the return
value to void (as suggested by David Miller).
After commit 0c24604b (tcp: implement RFC 5961 4.2), we no longer send RSTs in
response to SYNs. We can remove the check and processing on the return value of
tcp_rcv_established().
We also fix jtcp_rcv_established() in tcp_probe.c to match that of
tcp_rcv_established().
Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 09d45d718973..b14266bb91eb 100644 --- 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; } |
