diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-13 19:34:35 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-13 19:34:35 -0400 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /include/linux/netlink.h | |
| parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
| parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'include/linux/netlink.h')
| -rw-r--r-- | include/linux/netlink.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index aad8eeaf416d..f64b01787ddc 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
| @@ -169,4 +169,11 @@ struct netlink_tap { | |||
| 169 | extern int netlink_add_tap(struct netlink_tap *nt); | 169 | extern int netlink_add_tap(struct netlink_tap *nt); |
| 170 | extern int netlink_remove_tap(struct netlink_tap *nt); | 170 | extern int netlink_remove_tap(struct netlink_tap *nt); |
| 171 | 171 | ||
| 172 | bool __netlink_ns_capable(const struct netlink_skb_parms *nsp, | ||
| 173 | struct user_namespace *ns, int cap); | ||
| 174 | bool netlink_ns_capable(const struct sk_buff *skb, | ||
| 175 | struct user_namespace *ns, int cap); | ||
| 176 | bool netlink_capable(const struct sk_buff *skb, int cap); | ||
| 177 | bool netlink_net_capable(const struct sk_buff *skb, int cap); | ||
| 178 | |||
| 172 | #endif /* __LINUX_NETLINK_H */ | 179 | #endif /* __LINUX_NETLINK_H */ |