From 04f0977dca6e67ec8c3848900878726378a43806 Mon Sep 17 00:00:00 2001 From: Florent Fourcot Date: Tue, 8 Jan 2019 20:55:55 +0100 Subject: netfilter: ipset: merge uadd and udel functions Both functions are using exactly the same code, except the command value passed to call_ad function. Signed-off-by: Florent Fourcot Signed-off-by: Jozsef Kadlecsik --- kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel/include/linux/netfilter') 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 c5da39c..415104d 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -304,12 +304,15 @@ static inline int nla_put_in6_addr(struct sk_buff *skb, int attrtype, #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_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(net, nl, skb, ad, 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_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(net, nl, skb, ad, nlh, cda) #define IPSET_SOCK_NET(net, ctnl) net #else -#define IPSET_CBFN(fn, net, nl, skb, nlh, cda,e) fn(nl, skb, nlh, cda) +#define IPSET_CBFN(fn, net, nl, skb, nlh, cda, e) fn(nl, skb, nlh, cda) +#define IPSET_CBFN_AD(fn, net, nl, skb, ad, nlh, cda, e) fn(nl, skb, ad, nlh, cda) #define IPSET_SOCK_NET(net, ctnl) sock_net(ctnl) #endif -- cgit v1.2.3