diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-11 21:04:59 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-11 21:04:59 +0200 |
| commit | d88c5b79db7f84c6bce15b0d7cf461d725cb8824 (patch) | |
| tree | 9643a8b7231bc017b6c1b7fe76f5e036fd608777 /kernel/include/linux/netfilter/ipset | |
| parent | d50063b7d6951508380fadc97df32f2e3192f0da (diff) | |
Backport patch: netfilter: nfnetlink: extended ACK reporting
Diffstat (limited to 'kernel/include/linux/netfilter/ipset')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 14 |
1 files changed, 9 insertions, 5 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 36eecee..667a6b0 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -41,6 +41,7 @@ #@HAVE_NFNL_MSG_TYPE@ HAVE_NFNL_MSG_TYPE #@HAVE_NETLINK_EXTENDED_ACK@ HAVE_NETLINK_EXTENDED_ACK #@HAVE_PASSING_EXTENDED_ACK_TO_PARSERS@ HAVE_PASSING_EXTENDED_ACK_TO_PARSERS +#@HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS@ HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -273,12 +274,15 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, } #endif -#ifdef HAVE_NET_IN_NFNL_CALLBACK_FN -#define IPSET_CBFN(fn, net, nl, skb, nlh, cda) fn(net, nl, skb, nlh, cda) -#define IPSET_SOCK_NET(net, ctnl) net +#ifdef HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS +#define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(net, nl, skb, nlh, cda, e) +#define IPSET_SOCK_NET(net, ctnl) net +#elif defined(HAVE_NET_IN_NFNL_CALLBACK_FN) +#define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(net, nl, skb, nlh, cda) +#define IPSET_SOCK_NET(net, ctnl) net #else -#define IPSET_CBFN(fn, net, nl, skb, nlh, cda) fn(nl, skb, nlh, cda) -#define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) +#define IPSET_CBFN(fn, net, nl, skb, nlh, cda,e) fn(nl, skb, nlh, cda) +#define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) #endif #ifndef HAVE_TC_SKB_PROTOCOL |