From 2697d37fba7fd9ad0c3bf47528f1bd04e01d3c65 Mon Sep 17 00:00:00 2001 From: Vlad Drukker Date: Sat, 12 Nov 2005 12:13:14 -0800 Subject: [PATCH] --- yaml --- r: 14009 b: refs/heads/master c: a2d7222f0f5861ce13b9308c30bd18f28ebeb583 h: refs/heads/master i: 14007: c573a3a91e5e0808b69976ac000e8f91122cd030 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 + trunk/net/netfilter/nf_conntrack_proto_tcp.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7b8ffa159801..a7432d38c05b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efacfbcb6c88677809f44a574fbcd9824835dccb +refs/heads/master: a2d7222f0f5861ce13b9308c30bd18f28ebeb583 diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index 468c6003b4c7..5b3f5220f289 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -814,6 +814,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG) + 1] = { [TH_SYN] = 1, [TH_SYN|TH_ACK] = 1, + [TH_SYN|TH_PUSH] = 1, [TH_SYN|TH_ACK|TH_PUSH] = 1, [TH_RST] = 1, [TH_RST|TH_ACK] = 1, diff --git a/trunk/net/netfilter/nf_conntrack_proto_tcp.c b/trunk/net/netfilter/nf_conntrack_proto_tcp.c index 83d90dd624f0..156680ddb042 100644 --- a/trunk/net/netfilter/nf_conntrack_proto_tcp.c +++ b/trunk/net/netfilter/nf_conntrack_proto_tcp.c @@ -779,6 +779,7 @@ static u8 tcp_valid_flags[(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG) + 1] = { [TH_SYN] = 1, [TH_SYN|TH_ACK] = 1, + [TH_SYN|TH_PUSH] = 1, [TH_SYN|TH_ACK|TH_PUSH] = 1, [TH_RST] = 1, [TH_RST|TH_ACK] = 1,