diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-03 10:57:31 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2018-01-03 10:57:31 +0100 |
| commit | 0a81ab50306539788e2dd0471f3b1ed5b9dcc5ef (patch) | |
| tree | 995fcac0cdf514dcd941da9a10d0ab580e74871b /kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | |
| parent | d71dd93599b932693f045301424c2276cd25a87e (diff) | |
Backport patch: netfilter: ipset: Convert timers to use timer_setup()
Diffstat (limited to 'kernel/include/linux/netfilter/ipset/ip_set_compat.h.in')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 15 |
1 files changed, 15 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 2630600..e1caa68 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -43,6 +43,7 @@ #@HAVE_PASSING_EXTENDED_ACK_TO_PARSERS@ HAVE_PASSING_EXTENDED_ACK_TO_PARSERS #@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 #ifdef HAVE_EXPORT_SYMBOL_GPL_IN_MODULE_H #include <linux/module.h> @@ -337,6 +338,20 @@ static inline u16 nfnl_msg_type(u8 subsys, u8 msg_type) #define XT_FAMILY(par) (par)->family #endif +#ifdef HAVE_TIMER_SETUP +#define GC_ARG struct timer_list *t +#define TIMER_SETUP(a, b) timer_setup(a, b, 0) +#define INIT_GC_VARS(type, var) \ + struct type *var = from_timer(var, t, gc); \ + struct ip_set *set = var->set +#else +#define GC_ARG unsigned long ul_set +#define TIMER_SETUP(a, b) setup_timer(a, b, (unsigned long)set) +#define INIT_GC_VARS(type, var) \ + struct ip_set *set = (struct ip_set *)ul_set; \ + struct type *var = set->data +#endif + #ifndef smp_mb__before_atomic #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() |