Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b24b8a24 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NET]: Convert init_timer into setup_timer 



Many-many code in the kernel initialized the timer->function
and  timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.

The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a92aa318

net/802/tr.c

+1 −3
Original line number Diff line number Diff line
@@ -641,10 +641,8 @@ struct net_device *alloc_trdev(int sizeof_priv) 


static int __init rif_init(void)

{

	init_timer(&rif_timer);

	rif_timer.expires  = jiffies + sysctl_tr_rif_timeout;

	rif_timer.data     = 0L;

	rif_timer.function = rif_check_expire;

	setup_timer(&rif_timer, rif_check_expire, 0);

	add_timer(&rif_timer);



	proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);

net/appletalk/aarp.c

+1 −3
Original line number Diff line number Diff line
@@ -874,9 +874,7 @@ void __init aarp_proto_init(void) 
	aarp_dl = register_snap_client(aarp_snap_id, aarp_rcv);

	if (!aarp_dl)

		printk(KERN_CRIT "Unable to register AARP with SNAP.\n");

	init_timer(&aarp_timer);

	aarp_timer.function = aarp_expire_timeout;

	aarp_timer.data	    = 0;

	setup_timer(&aarp_timer, aarp_expire_timeout, 0);

	aarp_timer.expires  = jiffies + sysctl_aarp_expiry_time;

	add_timer(&aarp_timer);

	register_netdevice_notifier(&aarp_notifier);

net/appletalk/ddp.c

+2 −3
Original line number Diff line number Diff line
@@ -177,10 +177,9 @@ static inline void atalk_destroy_socket(struct sock *sk) 


	if (atomic_read(&sk->sk_wmem_alloc) ||

	    atomic_read(&sk->sk_rmem_alloc)) {

		init_timer(&sk->sk_timer);

		setup_timer(&sk->sk_timer, atalk_destroy_timer,

				(unsigned long)sk);

		sk->sk_timer.expires	= jiffies + SOCK_DESTROY_TIME;

		sk->sk_timer.function	= atalk_destroy_timer;

		sk->sk_timer.data	= (unsigned long)sk;

		add_timer(&sk->sk_timer);

	} else

		sock_put(sk);

net/atm/lec.c

+2 −3
Original line number Diff line number Diff line
@@ -1789,9 +1789,8 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv, 
	}

	memcpy(to_return->mac_addr, mac_addr, ETH_ALEN);

	INIT_HLIST_NODE(&to_return->next);

	init_timer(&to_return->timer);

	to_return->timer.function = lec_arp_expire_arp;

	to_return->timer.data = (unsigned long)to_return;

	setup_timer(&to_return->timer, lec_arp_expire_arp,

			(unsigned long)to_return);

	to_return->last_used = jiffies;

	to_return->priv = priv;

	skb_queue_head_init(&to_return->tx_wait);

net/ax25/af_ax25.c

+2 −3
Original line number Diff line number Diff line
@@ -330,10 +330,9 @@ void ax25_destroy_socket(ax25_cb *ax25) 
		if (atomic_read(&ax25->sk->sk_wmem_alloc) ||

		    atomic_read(&ax25->sk->sk_rmem_alloc)) {

			/* Defer: outstanding buffers */

			init_timer(&ax25->dtimer);

			setup_timer(&ax25->dtimer, ax25_destroy_timer,

					(unsigned long)ax25);

			ax25->dtimer.expires  = jiffies + 2 * HZ;

			ax25->dtimer.function = ax25_destroy_timer;

			ax25->dtimer.data     = (unsigned long)ax25;

			add_timer(&ax25->dtimer);

		} else {

			struct sock *sk=ax25->sk;