aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorVijay Subramanian <subramanian.vijay@gmail.com>2013-09-03 15:23:22 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-04 00:27:28 -0400
commitc995ae2259ee36caf48bbfacf40111998dacd4af (patch)
treedbe9be79766ab1c2a4f9da7ae461bd6ceab6bc9f /net/ipv6
parentcc8c6c1b21c9b1e0f1e89428c07c7c52435cba0c (diff)
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/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 5bcfadf09e95..9acdcedf9a14 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1360,8 +1360,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
1360 } 1360 }
1361 } 1361 }
1362 1362
1363 if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) 1363 tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);
1364 goto reset;
1365 if (opt_skb) 1364 if (opt_skb)
1366 goto ipv6_pktoptions; 1365 goto ipv6_pktoptions;
1367 return 0; 1366 return 0;