diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /net/ipv4/tcp_ipv4.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index f6f39e814291..4b04c3edd4a9 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -438,7 +438,6 @@ void tcp_v4_err(struct sk_buff *skb, u32 info) | |||
| 438 | It can f.e. if SYNs crossed. | 438 | It can f.e. if SYNs crossed. |
| 439 | */ | 439 | */ |
| 440 | if (!sock_owned_by_user(sk)) { | 440 | if (!sock_owned_by_user(sk)) { |
| 441 | TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS); | ||
| 442 | sk->sk_err = err; | 441 | sk->sk_err = err; |
| 443 | 442 | ||
| 444 | sk->sk_error_report(sk); | 443 | sk->sk_error_report(sk); |
| @@ -874,7 +873,6 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | |||
| 874 | drop_and_free: | 873 | drop_and_free: |
| 875 | reqsk_free(req); | 874 | reqsk_free(req); |
| 876 | drop: | 875 | drop: |
| 877 | TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS); | ||
| 878 | return 0; | 876 | return 0; |
| 879 | } | 877 | } |
| 880 | 878 | ||
