[TCP]: Use tcp_tw_put on time-wait sockets.

16e03737 · Nivedita Singhvi · James Morris · 7029b960 · 16e03737
Commit 16e03737 authored Mar 28, 2004 by Nivedita Singhvi Committed by James Morris Mar 28, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

net/ipv4/tcp_ipv4.c net/ipv4/tcp_ipv4.c +6 -3

No files found.
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1825,12 +1825,15 @@ int tcp_v4_rcv(struct sk_buff *skb)
 	goto discard_it;
 do_time_wait:
-	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
+	if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
-		goto discard_and_relse;
+		tcp_tw_put((struct tcp_tw_bucket *) sk);
+		goto discard_it;
+	}
 	if (skb->len < (th->doff << 2) || tcp_checksum_complete(skb)) {
 		TCP_INC_STATS_BH(TcpInErrs);
-		goto discard_and_relse;
+		tcp_tw_put((struct tcp_tw_bucket *) sk);
+		goto discard_it;
 	}
 	switch (tcp_timewait_state_process((struct tcp_tw_bucket *)sk,
 					   skb, th, skb->len)) {