Commit e6f689db authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Use setup_timer 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9afdb00c

net/bridge/netfilter/ebt_ulog.c

+1 −3
Original line number Diff line number Diff line
@@ -297,9 +297,7 @@ static int __init ebt_ulog_init(void) 


	/* initialize ulog_buffers */

	for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {

		init_timer(&ulog_buffers[i].timer);

		ulog_buffers[i].timer.function = ulog_timer;

		ulog_buffers[i].timer.data = i;

		setup_timer(&ulog_buffers[i].timer, ulog_timer, i);

		spin_lock_init(&ulog_buffers[i].lock);

	}

net/ipv4/netfilter/ipt_ULOG.c

+2 −5
Original line number Diff line number Diff line
@@ -376,11 +376,8 @@ static int __init ipt_ulog_init(void) 
	}



	/* initialize ulog_buffers */

	for (i = 0; i < ULOG_MAXNLGROUPS; i++) {

		init_timer(&ulog_buffers[i].timer);

		ulog_buffers[i].timer.function = ulog_timer;

		ulog_buffers[i].timer.data = i;

	}

	for (i = 0; i < ULOG_MAXNLGROUPS; i++)

		setup_timer(&ulog_buffers[i].timer, ulog_timer, i);



	nflognl = netlink_kernel_create(NETLINK_NFLOG, ULOG_MAXNLGROUPS, NULL,

					THIS_MODULE);

net/ipv6/netfilter/nf_conntrack_reasm.c

+2 −5
Original line number Diff line number Diff line
@@ -353,9 +353,7 @@ nf_ct_frag6_create(unsigned int hash, __be32 id, struct in6_addr *src, str 
	ipv6_addr_copy(&fq->saddr, src);

	ipv6_addr_copy(&fq->daddr, dst);



	init_timer(&fq->timer);

	fq->timer.function = nf_ct_frag6_expire;

	fq->timer.data = (long) fq;

	setup_timer(&fq->timer, nf_ct_frag6_expire, (unsigned long)fq);

	spin_lock_init(&fq->lock);

	atomic_set(&fq->refcnt, 1);
@@ -870,8 +868,7 @@ int nf_ct_frag6_init(void) 
	nf_ct_frag6_hash_rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^

				   (jiffies ^ (jiffies >> 6)));



	init_timer(&nf_ct_frag6_secret_timer);

	nf_ct_frag6_secret_timer.function = nf_ct_frag6_secret_rebuild;

	setup_timer(&nf_ct_frag6_secret_timer, nf_ct_frag6_secret_rebuild, 0);

	nf_ct_frag6_secret_timer.expires = jiffies

					   + nf_ct_frag6_secret_interval;

	add_timer(&nf_ct_frag6_secret_timer);

net/netfilter/nf_conntrack_core.c

+2 −3
Original line number Diff line number Diff line
@@ -620,9 +620,8 @@ __nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, 
	conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;

	conntrack->tuplehash[IP_CT_DIR_REPLY].tuple = *repl;

	/* Don't set timer yet: wait for confirmation */

	init_timer(&conntrack->timeout);

	conntrack->timeout.data = (unsigned long)conntrack;

	conntrack->timeout.function = death_by_timeout;

	setup_timer(&conntrack->timeout, death_by_timeout,

		    (unsigned long)conntrack);

	read_unlock_bh(&nf_ct_cache_lock);



	return conntrack;

net/netfilter/nf_conntrack_expect.c

+1 −3
Original line number Diff line number Diff line
@@ -290,9 +290,7 @@ static void nf_conntrack_expect_insert(struct nf_conntrack_expect *exp) 
	master_help->expecting++;

	list_add(&exp->list, &nf_conntrack_expect_list);



	init_timer(&exp->timeout);

	exp->timeout.data = (unsigned long)exp;

	exp->timeout.function = expectation_timed_out;

	setup_timer(&exp->timeout, expectation_timed_out, (unsigned long)exp);

	exp->timeout.expires = jiffies + master_help->helper->timeout * HZ;

	add_timer(&exp->timeout);