From patchwork Fri May 13 20:58:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Falak R Wani X-Patchwork-Id: 622130 X-Patchwork-Delegate: kadlec@blackhole.kfki.hu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r62L06H9Wz9sdg for ; Sat, 14 May 2016 06:59:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hEqGvu+f; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932345AbcEMU7S (ORCPT ); Fri, 13 May 2016 16:59:18 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34202 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932215AbcEMU7R (ORCPT ); Fri, 13 May 2016 16:59:17 -0400 Received: by mail-pf0-f196.google.com with SMTP id 145so10122090pfz.1; Fri, 13 May 2016 13:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=wkmFjZ1ImfOoIVfJmuu7/Ldz1rrCyPd7FBRy5FnOt/s=; b=hEqGvu+f2bz2s4JEjGeObdANc4oemUYstRaSv2zrKgvUdJVSYQII3keVuP0QUbZ01a AOshaemRpOgDQUWQjz+CHwIuJbci1iPsVLhOmdH7+i+0WiYzF9WqNZMghYBLfFAE10Ry HZzcjwXa246rU6ZR/TrM7eBqJrPChLLRT/YfCFBB8rL5NFkMz4WHG87TcwH9/Cz4O2AR 4zyyqemczR8Kb9k1Zr+DdjoWwjxyidZBUY8Se4w3LyeYy+ZSgXV5I6zhsej7wzTPnm8F 9c6Uk0VfbtPx6zxPgrCAdpdP4PPlq975dWl60YtLi6zmWkpTLlemL4sQuYo3Sho0AUQG UUaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wkmFjZ1ImfOoIVfJmuu7/Ldz1rrCyPd7FBRy5FnOt/s=; b=KTmtf7wP8Xhe8kwAYb8CXwJkXRPKocGwKHeWxRTJL5OTAOQsu3Cqp+ELnsCkQWGQyb sQ5Jdioh6odAI76QjEqiNI+yiP2f16cB9aUOGyjs8djivWYeljmtYXkv6Jw+RluAxv2S aXxQthwDzmtPgC8+P4ln/W5cWaoEgE9Nun5xtdU7724K1Z2VoL+uF4oTVa9C9wUkQ09V DwGXtPekdRgmppF1vJOBFAslimLJljFz+Rvgvp2kc97rJO40kd1rjn9xXbIXQfMgaym2 gvMmchBu7v55BtRAE/OLofUVQb2RnModJsTBjDPVU8PgYh3x3JjCIZzOfk+cgK9j36eZ 2Y/Q== X-Gm-Message-State: AOPr4FWgf7ba38EP8uVZolojTdP08k2Zluxd1/Xw5CJOqy6Eo2xQF3DNrQRg0jaLSICCcQ== X-Received: by 10.98.42.216 with SMTP id q207mr26228400pfq.6.1463173156351; Fri, 13 May 2016 13:59:16 -0700 (PDT) Received: from kp.domain.name ([110.235.28.83]) by smtp.gmail.com with ESMTPSA id v185sm29475712pfb.72.2016.05.13.13.59.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 May 2016 13:59:15 -0700 (PDT) From: Muhammad Falak R Wani To: "David S. Miller" Cc: Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , Vishwanath Pai , Joshua Hunt , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] netfilter: ipset: use setup_timer() and mod_timer(). Date: Sat, 14 May 2016 02:28:52 +0530 Message-Id: <1463173145-16167-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Use setup_timer() and instead of init_timer(), being the preferred way of setting up a timer. Also, quoting the mod_timer() function comment: -> mod_timer() is a more efficient way to update the expire field of an active timer (if the timer is inactive it will be activated). Use setup_timer() and mod_timer() to setup and arm a timer, making the code compact and easier to read. Signed-off-by: Muhammad Falak R Wani --- net/netfilter/ipset/ip_set_bitmap_gen.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h index 2e8e7e5..29ae5d8 100644 --- a/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -40,11 +40,8 @@ mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set)) { struct mtype *map = set->data; - init_timer(&map->gc); - map->gc.data = (unsigned long)set; - map->gc.function = gc; - map->gc.expires = jiffies + IPSET_GC_PERIOD(set->timeout) * HZ; - add_timer(&map->gc); + setup_timer(&map->gc, gc, (unsigned long)set); + mod_timer(&map->gc, jiffies + IPSET_GC_PERIOD(set->timeout) * HZ); } static void