diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-04 14:16:47 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-04 14:16:47 +0100 |
| commit | 47105aa93b404cc6538e45413ba8ad47b755b932 (patch) | |
| tree | d05a7897b76ee4813a142ab76eca90ac1d8c4837 /kernel/include | |
| parent | 7527bd335b6384ae59a86c11f643ec5ff488831c (diff) | |
Backport patch: netfilter: ipset: use nfnl_mutex_is_locked
Diffstat (limited to 'kernel/include')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 |
1 files changed, 5 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 e1caa68..c78867d 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -44,6 +44,7 @@ #@HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS@ HAVE_PASSING_EXTENDED_ACK_TO_CALLBACKS #@HAVE_TYPEDEF_SCTP_SCTPHDR_T@ HAVE_TYPEDEF_SCTP_SCTPHDR_T #@HAVE_TIMER_SETUP@ HAVE_TIMER_SETUP +#@HAVE_LOCKDEP_NFNL_IS_HELD@ HAVE_LOCKDEP_NFNL_IS_HELD #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -193,6 +194,10 @@ static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value) #define nfnl_unlock(x) nfnl_unlock() #endif +#ifndef HAVE_LOCKDEP_NFNL_IS_HELD +#define lockdep_nfnl_is_held(x) 1 +#endif + #if HAVE_IPV6_SKIP_EXTHDR_ARGS == 3 #define ipv6_skip_exthdr(skbuff, start, nexthdrp, frag_offp) \ ipv6_skip_exthdr(skbuff, start, nexthdrp) |