Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / net / ipv4 / tcp_diag.c

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index 57c5f0b10e6ccce7b90a51c75782a89bbac8112b..3904d2158a92c016de79ebf6a7da4b18ad867b8d 100644 (file)
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -25,11 +25,13 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
        const struct tcp_sock *tp = tcp_sk(sk);
        struct tcp_info *info = _info;
 
-       if (sk->sk_state == TCP_LISTEN)
+       if (sk->sk_state == TCP_LISTEN) {
                r->idiag_rqueue = sk->sk_ack_backlog;
-       else
+               r->idiag_wqueue = sk->sk_max_ack_backlog;
+       } else {
                r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
-       r->idiag_wqueue = tp->write_seq - tp->snd_una;
+               r->idiag_wqueue = tp->write_seq - tp->snd_una;
+       }
        if (info != NULL)
                tcp_get_info(sk, info);
 }