Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187988
b: refs/heads/master
c: bb134d5
h: refs/heads/master
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Mar 10, 2010
1 parent 029d098 commit cf95ba1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3
refs/heads/master: bb134d5d9580fc7b945e3bca3c4b263947022966
8 changes: 4 additions & 4 deletions trunk/net/ipv4/tcp_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -1651,15 +1651,15 @@ int tcp_v4_rcv(struct sk_buff *skb)
if (!sk)
goto no_tcp_socket;

process:
if (sk->sk_state == TCP_TIME_WAIT)
goto do_time_wait;

if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
goto discard_and_relse;
}

process:
if (sk->sk_state == TCP_TIME_WAIT)
goto do_time_wait;

if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
goto discard_and_relse;
nf_reset(skb);
Expand Down

0 comments on commit cf95ba1

Please sign in to comment.