aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2011-12-14 21:42:42 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-16 13:48:27 -0500
commite7c466e58eb1ff9bf49c2f3902622dc11a8c7022 (patch)
tree3b946527f5d7f9a014245c3d421c87c3b3a966ff
parentb26e478f8fd5b575684f021b05a5c6236ebb911a (diff)
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>
-rw-r--r--include/linux/inet_diag.h1
-rw-r--r--include/linux/sock_diag.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 78972a149dff..a27e62178d43 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -6,7 +6,6 @@
6/* Just some random number */ 6/* Just some random number */
7#define TCPDIAG_GETSOCK 18 7#define TCPDIAG_GETSOCK 18
8#define DCCPDIAG_GETSOCK 19 8#define DCCPDIAG_GETSOCK 19
9#define SOCK_DIAG_BY_FAMILY 20
10 9
11#define INET_DIAG_GETSOCK_MAX 24 10#define INET_DIAG_GETSOCK_MAX 24
12 11
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index ba4933b1213b..7999778ad08d 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -1,5 +1,8 @@
1#ifndef __SOCK_DIAG_H__ 1#ifndef __SOCK_DIAG_H__
2#define __SOCK_DIAG_H__ 2#define __SOCK_DIAG_H__
3
4#define SOCK_DIAG_BY_FAMILY 20
5
3struct sk_buff; 6struct sk_buff;
4struct nlmsghdr; 7struct nlmsghdr;
5 8