Sync with kernel headers
PATCH 1/1 Sync with kernel headers
Signed-off-by Felix Janda <[email protected]>
--- include/linux/netfilter/nfnetlink.h | 52 ++++++++----------------------------- 1 file changed, 11 insertions(+), 41 deletions(-)
include/linux/netfilter/nfnetlink.h +11 -41
@@ -18,6 +18,10 @@ enum nfnetlink_groups {#define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_DESTROY,#define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY + NFNLGRP_NFTABLES, +#define NFNLGRP_NFTABLES NFNLGRP_NFTABLES + NFNLGRP_ACCT_QUOTA, +#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA __NFNLGRP_MAX, };#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
@@ -51,46 +55,12 @@ struct nfgenmsg {#define NFNL_SUBSYS_ACCT 7#define NFNL_SUBSYS_CTNETLINK_TIMEOUT 8#define NFNL_SUBSYS_CTHELPER 9 -#define NFNL_SUBSYS_COUNT 10 +#define NFNL_SUBSYS_NFTABLES 10 +#define NFNL_SUBSYS_NFT_COMPAT 11 +#define NFNL_SUBSYS_COUNT 12 -#ifdef __KERNEL__ +/* Reserved control nfnetlink messages */ +#define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE +#define NFNL_MSG_BATCH_END NLMSG_MIN_TYPE+1 -#include <linux/netlink.h> -#include <linux/capability.h> -#include <net/netlink.h> - -struct nfnl_callback { -int (*call)(struct sock *nl,struct sk_buff *skb, -const struct nlmsghdr *nlh, -const struct nlattr *const cda[]); -int (*call_rcu)(struct sock *nl,struct sk_buff *skb, -const struct nlmsghdr *nlh, -const struct nlattr *const cda[]); -const struct nla_policy *policy;/* netlink attribute policy */ -const u_int16_t attr_count;/* number of nlattr's */ -}; - -struct nfnetlink_subsystem { -const char *name; -__u8 subsys_id;/* nfnetlink subsystem ID */ -__u8 cb_count;/* number of callbacks */ -const struct nfnl_callback *cb;/* callback for individual types */ -}; - -extern int nfnetlink_subsys_register (const struct nfnetlink_subsystem *n); -extern int nfnetlink_subsys_unregister (const struct nfnetlink_subsystem *n); - -extern int nfnetlink_has_listeners (struct net *net,unsigned int group); -extern int nfnetlink_send (struct sk_buff *skb,struct net *net,u32 pid,unsigned group, -int echo,gfp_t flags); -extern int nfnetlink_set_err (struct net *net,u32 pid,u32 group,int error); -extern int nfnetlink_unicast (struct sk_buff *skb,struct net *net,u_int32_t pid,int flags); - -extern void nfnl_lock (void ); -extern void nfnl_unlock (void ); - -#define MODULE_ALIAS_NFNL_SUBSYS (subsys) \ - MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) - -#endif /* __KERNEL__ */ -#endif /* _NFNETLINK_H */ +#endif /* _NFNETLINK_H */
Signature · 1 line
2.3.6