diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2011-12-15 02:42:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 13:48:27 -0500 |
| commit | e7c466e58eb1ff9bf49c2f3902622dc11a8c7022 (patch) | |
| tree | 3b946527f5d7f9a014245c3d421c87c3b3a966ff | |
| parent | b26e478f8fd5b575684f021b05a5c6236ebb911a (diff) | |
| download | linux-stable-e7c466e58eb1ff9bf49c2f3902622dc11a8c7022.tar.gz linux-stable-e7c466e58eb1ff9bf49c2f3902622dc11a8c7022.tar.bz2 linux-stable-e7c466e58eb1ff9bf49c2f3902622dc11a8c7022.zip | |
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.h | 1 | ||||
| -rw-r--r-- | 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 78972a149dff..a27e62178d43 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 ba4933b1213b..7999778ad08d 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; |