From 4eb939fdef3fb6bb270f9adec3edc21ec44d74ea Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 19 Mar 2010 05:37:18 +0000 Subject: [PATCH] --- yaml --- r: 193637 b: refs/heads/master c: 907cdda5205b012eec7513f66713749b293188c9 h: refs/heads/master i: 193635: c0bb5cfe908ea5ce2bacd253ed856aea93386685 v: v3 --- [refs] | 2 +- trunk/include/linux/snmp.h | 1 + trunk/net/ipv4/proc.c | 1 + trunk/net/ipv4/tcp_minisocks.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 99c4a8820718..b77bf5329200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a806c194ea112cfab00f558482dd97bee5e44e +refs/heads/master: 907cdda5205b012eec7513f66713749b293188c9 diff --git a/trunk/include/linux/snmp.h b/trunk/include/linux/snmp.h index 4435d1084755..d2a9aa3c6c88 100644 --- a/trunk/include/linux/snmp.h +++ b/trunk/include/linux/snmp.h @@ -227,6 +227,7 @@ enum LINUX_MIB_SACKSHIFTFALLBACK, LINUX_MIB_TCPBACKLOGDROP, LINUX_MIB_TCPMINTTLDROP, /* RFC 5082 */ + LINUX_MIB_TCPDEFERACCEPTDROP, __LINUX_MIB_MAX }; diff --git a/trunk/net/ipv4/proc.c b/trunk/net/ipv4/proc.c index 4f1f337f4337..3dc9914c1dce 100644 --- a/trunk/net/ipv4/proc.c +++ b/trunk/net/ipv4/proc.c @@ -251,6 +251,7 @@ static const struct snmp_mib snmp4_net_list[] = { SNMP_MIB_ITEM("TCPSackShiftFallback", LINUX_MIB_SACKSHIFTFALLBACK), SNMP_MIB_ITEM("TCPBacklogDrop", LINUX_MIB_TCPBACKLOGDROP), SNMP_MIB_ITEM("TCPMinTTLDrop", LINUX_MIB_TCPMINTTLDROP), + SNMP_MIB_ITEM("TCPDeferAcceptDrop", LINUX_MIB_TCPDEFERACCEPTDROP), SNMP_MIB_SENTINEL }; diff --git a/trunk/net/ipv4/tcp_minisocks.c b/trunk/net/ipv4/tcp_minisocks.c index 4199bc6915c5..32f96278a24a 100644 --- a/trunk/net/ipv4/tcp_minisocks.c +++ b/trunk/net/ipv4/tcp_minisocks.c @@ -671,6 +671,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, if (req->retrans < inet_csk(sk)->icsk_accept_queue.rskq_defer_accept && TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) { inet_rsk(req)->acked = 1; + NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPDEFERACCEPTDROP); return NULL; }