summaryrefslogtreecommitdiff
path: root/include/trace/events
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2017-02-09 16:46:45 +0800
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-12 14:39:06 +0100
commita96e66e702bc615f5927b15c739c91d5098dac59 (patch)
tree39dd3a9311fcb5e4018f6d832110d0c99ac6bb5c /include/trace/events
parent935b7f643018878bd9d4193eea8b575aff736b9b (diff)
netfilter: nf_ct_sip: Use mod_timer_pending()
timer_del() followed by timer_add() can be replaced by mod_timer_pending(). Signed-off-by: Gao Feng <fgao@ikuai8.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/trace/events')
0 files changed, 0 insertions, 0 deletions
Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni: "A single fix for this cycle. It is worth taking it for 4.10 so that distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to y in their config. Summary: - Allow jz4740 to build as a module again by using kernel_halt()" * tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_ipmac.c')