diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-11 20:45:44 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-09-11 20:45:44 +0200 |
| commit | 2c9ec23d25766a71ed3f262007b8f2211cd4a769 (patch) | |
| tree | 1d82e1f425052ff4848239e9482171b60dd1ac46 /kernel/include/linux/netfilter/ipset | |
| parent | ad62744cab5be7751fb56d2476b8427fc9938fe2 (diff) | |
Backport patch: netlink: pass extended ACK struct to parsing functions
Diffstat (limited to 'kernel/include/linux/netfilter/ipset')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 9 |
1 files changed, 9 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 fd1696b..36eecee 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -40,6 +40,7 @@ #@HAVE_XT_NET@ HAVE_XT_NET #@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 #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -311,6 +312,14 @@ static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type) #define NETLINK_ACK(in_skb, nlh, err, extack) netlink_ack(in_skb, nlh, err) #endif +#ifdef HAVE_PASSING_EXTENDED_ACK_TO_PARSERS +#define NLA_PARSE(t, m, h, l, p, e) nla_parse(t, m, h, l, p, e) +#define NLA_PARSE_NESTED(t, m, n, p, e) nla_parse_nested(t, m, n, p, e) +#else +#define NLA_PARSE(t, m, h, l, p, e) nla_parse(t, m, h, l, p) +#define NLA_PARSE_NESTED(t, m, n, p, e) nla_parse_nested(t, m, n, p) +#endif + #ifdef HAVE_STATE_IN_XT_ACTION_PARAM #define XAP_STATE(par) (par->state) #else |