From 039125a8bd085706ca2868f028a3ad79ab8578a5 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Sat, 26 Jun 2021 22:21:05 +0200 Subject: Backport "netfilter: nfnetlink: consolidate callback type" Backport patch "netfilter: nfnetlink: consolidate callback type" from Pablo Neira Ayuso . Signed-off-by: Jozsef Kadlecsik --- kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in') 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 @@ -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 -- cgit v1.2.3