Subject: [PATCH 1/13] sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration

From: Pavel Emelyanov <[email-masked]>
Date: Thu, 15 Dec 2011 16:42:42 +0400

It should belong to sock_diag, not inet_diag.

Signed-off-by: Pavel Emelyanov <[email-masked]>

---
 include/linux/inet_diag.h |    1 -
 include/linux/sock_diag.h |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 78972a1..a27e621 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -6,7 +6,6 @@
 /* Just some random number */
 #define TCPDIAG_GETSOCK 18
 #define DCCPDIAG_GETSOCK 19
-#define SOCK_DIAG_BY_FAMILY 20
 
 #define INET_DIAG_GETSOCK_MAX 24
 
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index ba4933b..7999778 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -1,5 +1,8 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
+
+#define SOCK_DIAG_BY_FAMILY 20
+
 struct sk_buff;
 struct nlmsghdr;
 
-- 
1.5.5.6