Use timer_shutdown_sync() when available, instead of del_timer_sync()

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>

diff --git a/configure.ac b/configure.ac
index b6d1363bfd85978526a58ccf1b6492a051e9b0aa..5d4c6550c6d817c7da2bf32d18ccd04b300dd520 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -725,6 +725,16 @@ else
        AC_SUBST(HAVE_TIMER_SETUP, undef)
 fi
 
+AC_MSG_CHECKING([kernel source for timer_shutdown_sync() in timer.h])
+if test -f $ksourcedir/include/linux/timer.h && \
+   $GREP -q ' timer_shutdown_sync' $ksourcedir/include/linux/timer.h; then
+       AC_MSG_RESULT(yes)
+       AC_SUBST(HAVE_TIMER_SHUTDOWN_SYNC, define)
+else
+       AC_MSG_RESULT(no)
+       AC_SUBST(HAVE_TIMER_SHUTDOWN_SYNC, undef)
+fi
+
 AC_MSG_CHECKING([kernel source for lockdep_nfnl_is_held() in nfnetlink.h])
 if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \
    $GREP -q ' lockdep_nfnl_is_held' $ksourcedir/include/linux/netfilter/nfnetlink.h; then

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 b1095493b9545f0c136a00313eff45b334746326..5746f39c168f711ba36e573810c9f08ef36ee46d 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -51,6 +51,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_TIMER_SHUTDOWN_SYNC@ HAVE_TIMER_SHUTDOWN_SYNC
 #@HAVE_STRSCPY@ HAVE_STRSCPY
 #@HAVE_STRSCPY_PAD@ HAVE_STRSCPY_PAD
 #@HAVE_SYNCHRONIZE_RCU_BH@ HAVE_SYNCHRONIZE_RCU_BH
@@ -506,6 +507,10 @@ static inline struct nlmsghdr *nfnl_msg_put(struct sk_buff *skb, u32 portid,
        struct type *var = set->data
 #endif
 
+#ifndef HAVE_TIMER_SHUTDOWN_SYNC
+#define timer_shutdown_sync(timer)     del_timer_sync(timer)
+#endif
+
 #ifndef HAVE_STRSCPY
 static inline ssize_t strscpy(char * dest, const char * src, size_t count)
 {