diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sock_diag.h | 3 | ||||
-rw-r--r-- | include/uapi/linux/packet_diag.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index e8d702e0fd89..54f91d35e5fd 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __SOCK_DIAG_H__ | 1 | #ifndef __SOCK_DIAG_H__ |
2 | #define __SOCK_DIAG_H__ | 2 | #define __SOCK_DIAG_H__ |
3 | 3 | ||
4 | #include <linux/user_namespace.h> | ||
4 | #include <uapi/linux/sock_diag.h> | 5 | #include <uapi/linux/sock_diag.h> |
5 | 6 | ||
6 | struct sk_buff; | 7 | struct sk_buff; |
@@ -22,5 +23,7 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie); | |||
22 | void sock_diag_save_cookie(void *sk, __u32 *cookie); | 23 | void sock_diag_save_cookie(void *sk, __u32 *cookie); |
23 | 24 | ||
24 | int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr); | 25 | int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr); |
26 | int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk, | ||
27 | struct sk_buff *skb, int attrtype); | ||
25 | 28 | ||
26 | #endif | 29 | #endif |
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index c0802c18c8ad..b2cc0cd9c4d9 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h | |||
@@ -17,6 +17,7 @@ struct packet_diag_req { | |||
17 | #define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */ | 17 | #define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */ |
18 | #define PACKET_SHOW_FANOUT 0x00000008 | 18 | #define PACKET_SHOW_FANOUT 0x00000008 |
19 | #define PACKET_SHOW_MEMINFO 0x00000010 | 19 | #define PACKET_SHOW_MEMINFO 0x00000010 |
20 | #define PACKET_SHOW_FILTER 0x00000020 | ||
20 | 21 | ||
21 | struct packet_diag_msg { | 22 | struct packet_diag_msg { |
22 | __u8 pdiag_family; | 23 | __u8 pdiag_family; |
@@ -35,6 +36,7 @@ enum { | |||
35 | PACKET_DIAG_FANOUT, | 36 | PACKET_DIAG_FANOUT, |
36 | PACKET_DIAG_UID, | 37 | PACKET_DIAG_UID, |
37 | PACKET_DIAG_MEMINFO, | 38 | PACKET_DIAG_MEMINFO, |
39 | PACKET_DIAG_FILTER, | ||
38 | 40 | ||
39 | __PACKET_DIAG_MAX, | 41 | __PACKET_DIAG_MAX, |
40 | }; | 42 | }; |