---

yaml --- r: 328058 b: refs/heads/master c: e69bebd h: refs/heads/master v: v3
git-mirror · Sep 22, 2012 · 5a2b2bc · 5a2b2bc
1 parent dedb973
commit 5a2b2bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 072539880156fafd86c753070e598c23e8e74586
+refs/heads/master: e69bebde46b5ddfb7d8f17cae66031e282ebc464
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -5969,7 +5969,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 
 		if (tcp_check_req(sk, skb, req, NULL, true) == NULL)
 			goto discard;
-	} else if (!tcp_validate_incoming(sk, skb, th, 0))
+	}
+	if (!tcp_validate_incoming(sk, skb, th, 0))
 		return 0;
 
 	/* step 5: check the ACK field */