From: Pavel Emelyanov <xemul@parallels.com>
Date: Thu, 15 Dec 2011 02:42:42 +0000 (+0000)
Subject: sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration
X-Git-Tag: upstream/snapshot3+hdmi~8450^2~206
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7c466e58eb1ff9bf49c2f3902622dc11a8c7022;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration

It should belong to sock_diag, not inet_diag.

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

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;