From 47105aa93b404cc6538e45413ba8ad47b755b932 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 4 Jan 2018 14:16:47 +0100 Subject: Backport patch: netfilter: ipset: use nfnl_mutex_is_locked --- kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'kernel/include') 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 @@ -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) -- cgit v1.2.3