commit c0636faa539ec4205ec50e80844a5b0454b4bbaa
author Pavel Emelyanov <xemul@parallels.com> Fri Dec 30 00:53:32 2011 +0000
committer David S. Miller <davem@davemloft.net> Fri Dec 30 16:42:19 2011 -0500
tree 16af09a4c857a1ec45bf573e39c6b46fedbd103f
parent 5d2e5f274f9e9a06fb934dd45260e2616a9992e6

inet_diag: Add the SKMEMINFO extension

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/inet_diag.c

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index fb2e47f..2240a8e 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -136,6 +136,10 @@
 		minfo->idiag_tmem = sk_wmem_alloc_get(sk);
 	}
 
+	if (ext & (1 << (INET_DIAG_SKMEMINFO - 1)))
+		if (sock_diag_put_meminfo(sk, skb, INET_DIAG_SKMEMINFO))
+			goto rtattr_failure;
+
 	if (icsk == NULL) {
 		r->idiag_rqueue = r->idiag_wqueue = 0;
 		goto out;