diff options
| author | Jozsef Kadlecsik <kadlec@netfilter.org> | 2021-06-26 22:21:05 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@netfilter.org> | 2021-06-26 22:21:05 +0200 |
| commit | 039125a8bd085706ca2868f028a3ad79ab8578a5 (patch) | |
| tree | cf6b3b6f76b8a05fc1e82dc91261ead39e8c17bb /kernel/include/linux/netfilter | |
| parent | 3dda931dcf657e9ab32f6ad45f38e3d9c876e12c (diff) | |
Backport "netfilter: nfnetlink: consolidate callback type"
Backport patch "netfilter: nfnetlink: consolidate callback type"
from Pablo Neira Ayuso <pablo@netfilter.org>.
Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Diffstat (limited to 'kernel/include/linux/netfilter')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index 5f44f63..af6424d 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -64,6 +64,7 @@ #@HAVE_NLA_STRSCPY@ HAVE_NLA_STRSCPY #@HAVE_NFNL_MSG_PUT@ HAVE_NFNL_MSG_PUT #@HAVE_NFNL_INFO_IN_NFNL_CALLBACK@ HAVE_NFNL_INFO_IN_NFNL_CALLBACK +#@HAVE_NFNL_CALLBACK_TYPE@ HAVE_NFNL_CALLBACK_TYPE #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -380,6 +381,12 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #define INFO_SK(i, n) n #endif +#ifdef HAVE_NFNL_CALLBACK_TYPE +#define SET_NFNL_CALLBACK_TYPE(t) .type = t, +#else +#define SET_NFNL_CALLBACK_TYPE(t) +#endif + #ifndef HAVE_TC_SKB_PROTOCOL #include <linux/if_vlan.h> |