projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b26e478)
sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration
authorPavel Emelyanov <xemul@parallels.com>
Thu, 15 Dec 2011 02:42:42 +0000 (02:42 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 18:48:27 +0000 (13:48 -0500)
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>
include/linux/inet_diag.h patch | blob | blame | history
include/linux/sock_diag.h patch | blob | blame | history

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 78972a149dff1224438d5065185317f29e3bf23f..a27e62178d43f4b6370c8943bd58ab4e12921cb3 100644 (file)
--- 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 ba4933b1213b18552dd8e894f5744f51da9a8724..7999778ad08d53f0f3328ada734a91075a7f6ec7 100644 (file)
--- 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;