diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-29 13:22:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-29 13:22:07 -0400 |
| commit | 13ccf043ce85b64802a57bd3e47ca1505b6bf275 (patch) | |
| tree | 16093300e9da78c1c3e272283ae4886d7b3984e8 /include/linux/sock_diag.h | |
| parent | fdd5f43a1b53a844d04c6eda2cbdbe044b629ae7 (diff) | |
| parent | e8d9612c181b1a68ba5f71384629343466f1bd13 (diff) | |
Merge branch 'pktdiag'
Nicolas Dichtel says:
====================
The goal of this patchset is to be able to get all infos exported via the
/proc/net/packet and also beeing able to get filter associated to af_packet
sockets.
As usual, the patch against iproute2 will be sent once the patches are included
and net-next merged. I can send it on demand.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/sock_diag.h')
| -rw-r--r-- | include/linux/sock_diag.h | 3 |
1 files changed, 3 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 @@ #ifndef __SOCK_DIAG_H__ #define __SOCK_DIAG_H__ +#include <linux/user_namespace.h> #include <uapi/linux/sock_diag.h> struct sk_buff; @@ -22,5 +23,7 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie); void sock_diag_save_cookie(void *sk, __u32 *cookie); int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr); +int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk, + struct sk_buff *skb, int attrtype); #endif |