Commit f4293c2b authored by Easwar Hariharan's avatar Easwar Hariharan Committed by Pablo Neira Ayuso
Browse files

netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies() 



Commit b35108a5 ("jiffies: Define secs_to_jiffies()") introduced
secs_to_jiffies().  As the value here is a multiple of 1000, use
secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.

This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
the following Coccinelle rules:

@depends on patch@
expression E;
@@

-msecs_to_jiffies(E * 1000)
+secs_to_jiffies(E)

-msecs_to_jiffies(E * MSEC_PER_SEC)
+secs_to_jiffies(E)

Signed-off-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent bef4f115

net/netfilter/xt_IDLETIMER.c

+6 −6
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) 
	INIT_WORK(&info->timer->work, idletimer_tg_work);



	mod_timer(&info->timer->timer,

		  msecs_to_jiffies(info->timeout * 1000) + jiffies);

		  secs_to_jiffies(info->timeout) + jiffies);



	return 0;
@@ -229,7 +229,7 @@ static int idletimer_tg_create_v1(struct idletimer_tg_info_v1 *info) 
	} else {

		timer_setup(&info->timer->timer, idletimer_tg_expired, 0);

		mod_timer(&info->timer->timer,

				msecs_to_jiffies(info->timeout * 1000) + jiffies);

				secs_to_jiffies(info->timeout) + jiffies);

	}



	return 0;
@@ -254,7 +254,7 @@ static unsigned int idletimer_tg_target(struct sk_buff *skb, 
		 info->label, info->timeout);



	mod_timer(&info->timer->timer,

		  msecs_to_jiffies(info->timeout * 1000) + jiffies);

		  secs_to_jiffies(info->timeout) + jiffies);



	return XT_CONTINUE;

}
@@ -275,7 +275,7 @@ static unsigned int idletimer_tg_target_v1(struct sk_buff *skb, 
		alarm_start_relative(&info->timer->alarm, tout);

	} else {

		mod_timer(&info->timer->timer,

				msecs_to_jiffies(info->timeout * 1000) + jiffies);

				secs_to_jiffies(info->timeout) + jiffies);

	}



	return XT_CONTINUE;
@@ -320,7 +320,7 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par) 
	if (info->timer) {

		info->timer->refcnt++;

		mod_timer(&info->timer->timer,

			  msecs_to_jiffies(info->timeout * 1000) + jiffies);

			  secs_to_jiffies(info->timeout) + jiffies);



		pr_debug("increased refcnt of timer %s to %u\n",

			 info->label, info->timer->refcnt);
@@ -382,7 +382,7 @@ static int idletimer_tg_checkentry_v1(const struct xt_tgchk_param *par) 
			}

		} else {

				mod_timer(&info->timer->timer,

					msecs_to_jiffies(info->timeout * 1000) + jiffies);

					secs_to_jiffies(info->timeout) + jiffies);

		}

		pr_debug("increased refcnt of timer %s to %u\n",

			 info->label, info->timer->refcnt);