aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/ip_conntrack_proto_tcp.c4
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index e7fa29e576dc..77f304680d86 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -995,7 +995,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
995 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) 995 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
996 && conntrack->proto.tcp.last_index == TCP_ACK_SET)) 996 && conntrack->proto.tcp.last_index == TCP_ACK_SET))
997 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { 997 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) {
998 /* RST sent to invalid SYN or ACK we had let trough 998 /* RST sent to invalid SYN or ACK we had let through
999 * at a) and c) above: 999 * at a) and c) above:
1000 * 1000 *
1001 * a) SYN was in window then 1001 * a) SYN was in window then
@@ -1006,7 +1006,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
1006 * segments we ignored. */ 1006 * segments we ignored. */
1007 goto in_window; 1007 goto in_window;
1008 } 1008 }
1009 /* Just fall trough */ 1009 /* Just fall through */
1010 default: 1010 default:
1011 /* Keep compilers happy. */ 1011 /* Keep compilers happy. */
1012 break; 1012 break;
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 6167137a5cb5..9a1348a51a0d 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -988,7 +988,7 @@ static int tcp_packet(struct nf_conn *conntrack,
988 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) 988 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
989 && conntrack->proto.tcp.last_index == TCP_ACK_SET)) 989 && conntrack->proto.tcp.last_index == TCP_ACK_SET))
990 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { 990 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) {
991 /* RST sent to invalid SYN or ACK we had let trough 991 /* RST sent to invalid SYN or ACK we had let through
992 * at a) and c) above: 992 * at a) and c) above:
993 * 993 *
994 * a) SYN was in window then 994 * a) SYN was in window then
@@ -999,7 +999,7 @@ static int tcp_packet(struct nf_conn *conntrack,
999 * segments we ignored. */ 999 * segments we ignored. */
1000 goto in_window; 1000 goto in_window;
1001 } 1001 }
1002 /* Just fall trough */ 1002 /* Just fall through */
1003 default: 1003 default:
1004 /* Keep compilers happy. */ 1004 /* Keep compilers happy. */
1005 break; 1005 break;