---

yaml --- r: 313875 b: refs/heads/master c: d594e98 h: refs/heads/master i: 313873: 03d9bbd 313871: 5ab7ca7 v: v3
git-mirror · Jun 4, 2012 · ed2a3fa · ed2a3fa
1 parent 04d1853
commit ed2a3fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;