tcp: Change return value of tcp_rcv_established()

subrav · davem330 · commit c995ae2259ee · 2013-09-04T00:27:28.000-04:00
tcp_rcv_established() returns only one value namely 0. We change the return value to void (as suggested by David Miller). After commit 0c24604 (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>
diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -371,8 +371,8 @@ extern void tcp_delack_timer_handler(struct sock *sk);
 extern int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 				 const struct tcphdr *th, unsigned int len);
-extern int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-			       const struct tcphdr *th, unsigned int len);
+extern void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
+				const struct tcphdr *th, unsigned int len);
 extern void tcp_rcv_space_adjust(struct sock *sk);
 extern void tcp_cleanup_rbuf(struct sock *sk, int copied);
 extern int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
@@ -5049,8 +5049,8 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,
  *	the rest is checked inline. Fast processing is turned on in
  *	tcp_data_queue when everything is OK.
  */
-int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-			const struct tcphdr *th, unsigned int len)
+void tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
+			 const struct tcphdr *th, unsigned int len)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 
@@ -5127,7 +5127,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 				tcp_ack(sk, skb, 0);
 				__kfree_skb(skb);
 				tcp_data_snd_check(sk);
-				return 0;
+				return;
 			} else { /* Header too small */
 				TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);
 				goto discard;
@@ -5220,7 +5220,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 			if (eaten)
 				kfree_skb_partial(skb, fragstolen);
 			sk->sk_data_ready(sk, 0);
-			return 0;
+			return;
 		}
 	}
 
@@ -5236,7 +5236,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 	 */
 
 	if (!tcp_validate_incoming(sk, skb, th, 1))
-		return 0;
+		return;
 
 step5:
 	if (tcp_ack(sk, skb, FLAG_SLOWPATH | FLAG_UPDATE_TS_RECENT) < 0)
@@ -5252,15 +5252,14 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 
 	tcp_data_snd_check(sk);
 	tcp_ack_snd_check(sk);
-	return 0;
+	return;
 
 csum_error:
 	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_CSUMERRORS);
 	TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_INERRS);
 
 discard:
 	__kfree_skb(skb);
-	return 0;
 }
 EXPORT_SYMBOL(tcp_rcv_established);
 
diff --git 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;
 	}
 
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
@@ -122,8 +122,8 @@ static inline int tcp_probe_avail(void)
  * Hook inserted to be called before each receive packet.
  * Note: arguments must match tcp_rcv_established()!
  */
-static int jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-				const struct tcphdr *th, unsigned int len)
+static void jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,
+				 const struct tcphdr *th, unsigned int len)
 {
 	const struct tcp_sock *tp = tcp_sk(sk);
 	const struct inet_sock *inet = inet_sk(sk);
@@ -172,7 +172,6 @@ static int jtcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 	}
 
 	jprobe_return();
-	return 0;
 }
 
 static struct jprobe tcp_jprobe = {
diff --git 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)
 			}
 		}
 
-		if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len))
-			goto reset;
+		tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);
 		if (opt_skb)
 			goto ipv6_pktoptions;
 		return 0;

Original file line number	Diff line number	Diff line change
`@@ -1799,10 +1799,7 @@ int tcp_v4_do_rcv(struct sock sk, struct sk_buff skb)`
`1799`	`1799`	`sk->sk_rx_dst = NULL;`
`1800`	`1800`	`}`
`1801`	`1801`	`}`
`1802`		`- if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {`
`1803`		`- rsk = sk;`
`1804`		`- goto reset;`
`1805`		`- }`
	`1802`	`+ tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);`
`1806`	`1803`	`return 0;`
`1807`	`1804`	`}`
`1808`	`1805`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,8 @@ static inline int tcp_probe_avail(void)`
`122`	`122`	`* Hook inserted to be called before each receive packet.`
`123`	`123`	`* Note: arguments must match tcp_rcv_established()!`
`124`	`124`	`*/`
`125`		`-static int jtcp_rcv_established(struct sock sk, struct sk_buff skb,`
`126`		`- const struct tcphdr *th, unsigned int len)`
	`125`	`+static void jtcp_rcv_established(struct sock sk, struct sk_buff skb,`
	`126`	`+ const struct tcphdr *th, unsigned int len)`
`127`	`127`	`{`
`128`	`128`	`const struct tcp_sock *tp = tcp_sk(sk);`
`129`	`129`	`const struct inet_sock *inet = inet_sk(sk);`
`@@ -172,7 +172,6 @@ static int jtcp_rcv_established(struct sock sk, struct sk_buff skb,`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`jprobe_return();`
`175`		`- return 0;`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`static struct jprobe tcp_jprobe = {`
Original file line number	Diff line number	Diff line change
`@@ -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))`
`1364`		`- goto reset;`
	`1363`	`+ tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len);`
`1365`	`1364`	`if (opt_skb)`
`1366`	`1365`	`goto ipv6_pktoptions;`
`1367`	`1366`	`return 0;`