diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-06-04 08:01:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-07 01:55:01 -0700 |
| commit | 98da81a426a76c351f3c2854d5bc31f17bba3194 (patch) | |
| tree | 636dbfc8c16b4150e41aa32ff9b8774ed3f19f3b /net | |
| parent | 908e80d6546813aaf8b546b4b4483fcec24190b6 (diff) | |
| download | op-kernel-dev-98da81a426a76c351f3c2854d5bc31f17bba3194.zip op-kernel-dev-98da81a426a76c351f3c2854d5bc31f17bba3194.tar.gz | |
tcp: remove redundant checks II
For same reasons than in commit 12e25e1041d0 ("tcp: remove redundant
checks"), we can remove redundant checks done for timewait sockets.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 3130c42..d7d4c2b 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1671,10 +1671,6 @@ do_time_wait: goto discard_it; } - if (skb->len < (th->doff << 2)) { - inet_twsk_put(inet_twsk(sk)); - goto bad_packet; - } if (tcp_checksum_complete(skb)) { inet_twsk_put(inet_twsk(sk)); goto csum_error; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b72e1ff..45a7176 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1467,10 +1467,6 @@ do_time_wait: tcp_v6_fill_cb(skb, hdr, th); - if (skb->len < (th->doff<<2)) { - inet_twsk_put(inet_twsk(sk)); - goto bad_packet; - } if (tcp_checksum_complete(skb)) { inet_twsk_put(inet_twsk(sk)); goto csum_error; |
