From ed2a3faf042f06e5b3df37e0ce32e428968238b6 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 4 Jun 2012 03:50:35 +0000
Subject: [PATCH] --- yaml --- r: 313875 b: refs/heads/master c:
 d594e987c6f5417cc63dd7e107a2a03a7eeee03f h: refs/heads/master i:   313873:
 03d9bbdb4c9045f9f00936304025a3b09e2a4c06   313871:
 5ab7ca7019805f5f203c9e2c582bdc0d66b4eff8 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/sock_diag.h | 1 +
 trunk/net/core/sock_diag.c      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb8271715ab8..0dec69deac3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d0ba55b6486f58cc890918d7167063d83f7fbb4
+refs/heads/master: d594e987c6f5417cc63dd7e107a2a03a7eeee03f
diff --git a/trunk/include/linux/sock_diag.h b/trunk/include/linux/sock_diag.h
index db4bae78bda9..6793fac5eab5 100644
--- a/trunk/include/linux/sock_diag.h
+++ b/trunk/include/linux/sock_diag.h
@@ -18,6 +18,7 @@ enum {
 	SK_MEMINFO_FWD_ALLOC,
 	SK_MEMINFO_WMEM_QUEUED,
 	SK_MEMINFO_OPTMEM,
+	SK_MEMINFO_BACKLOG,
 
 	SK_MEMINFO_VARS,
 };
diff --git a/trunk/net/core/sock_diag.c b/trunk/net/core/sock_diag.c
index 5fd146720f39..0d934ce1075f 100644
--- a/trunk/net/core/sock_diag.c
+++ b/trunk/net/core/sock_diag.c
@@ -46,6 +46,7 @@ int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attrtype)
 	mem[SK_MEMINFO_FWD_ALLOC] = sk->sk_forward_alloc;
 	mem[SK_MEMINFO_WMEM_QUEUED] = sk->sk_wmem_queued;
 	mem[SK_MEMINFO_OPTMEM] = atomic_read(&sk->sk_omem_alloc);
+	mem[SK_MEMINFO_BACKLOG] = sk->sk_backlog.len;
 
 	return 0;