From d6189ef82b46e3d004ac93ae685750ba7e3c043d Mon Sep 17 00:00:00 2001
From: Rick Jones <rick.jones2@hp.com>
Date: Tue, 18 Sep 2007 13:26:31 -0700
Subject: [PATCH] --- yaml --- r: 66627 b: refs/heads/master c:
 5ee3afba88f5a79d0bff07ddd87af45919259f91 h: refs/heads/master i:   66625:
 971c19497b5cde53e7bcc7c9e9ad5c22d862df78   66623:
 267c727303dcbb6de15b77ad6289f69cc27a1f18 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp.c      | 9 +++++++--
 trunk/net/ipv4/tcp_diag.c | 8 +++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 665345250af6..a3deafcc4972 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768f3591e2b1cc309fd6f10d6579b216026d7817
+refs/heads/master: 5ee3afba88f5a79d0bff07ddd87af45919259f91
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 18c64c74f6d5..4f322003835d 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/net/ipv4/tcp.c
@@ -2031,8 +2031,13 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
 	info->tcpi_snd_mss = tp->mss_cache;
 	info->tcpi_rcv_mss = icsk->icsk_ack.rcv_mss;
 
-	info->tcpi_unacked = tp->packets_out;
-	info->tcpi_sacked = tp->sacked_out;
+	if (sk->sk_state == TCP_LISTEN) {
+		info->tcpi_unacked = sk->sk_ack_backlog;
+		info->tcpi_sacked = sk->sk_max_ack_backlog;
+	} else {
+		info->tcpi_unacked = tp->packets_out;
+		info->tcpi_sacked = tp->sacked_out;
+	}
 	info->tcpi_lost = tp->lost_out;
 	info->tcpi_retrans = tp->retrans_out;
 	info->tcpi_fackets = tp->fackets_out;
diff --git a/trunk/net/ipv4/tcp_diag.c b/trunk/net/ipv4/tcp_diag.c
index 57c5f0b10e6c..3904d2158a92 100644
--- a/trunk/net/ipv4/tcp_diag.c
+++ b/trunk/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);
 }