diff options
| -rw-r--r-- | net/802/tr.c | 2 | ||||
| -rw-r--r-- | net/atm/mpc.c | 2 | ||||
| -rw-r--r-- | net/core/neighbour.c | 2 | ||||
| -rw-r--r-- | net/ipv6/mcast.c | 1 | ||||
| -rw-r--r-- | net/irda/af_irda.c | 1 | ||||
| -rw-r--r-- | net/llc/llc_main.c | 5 | ||||
| -rw-r--r-- | net/sched/sch_sfq.c | 2 |
7 files changed, 11 insertions, 4 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index 31cfc898bee3..4594952e7174 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -541,10 +541,10 @@ static int rif_get_info(char *buffer,char **start, off_t offset, int length) static int __init rif_init(void) { + init_timer(&rif_timer); rif_timer.expires = RIF_TIMEOUT; rif_timer.data = 0L; rif_timer.function = rif_check_expire; - init_timer(&rif_timer); add_timer(&rif_timer); proc_net_create("tr_rif",0,rif_get_info); diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 513f008c8397..15cc0f2184d4 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -104,7 +104,7 @@ extern void mpc_proc_clean(void); struct mpoa_client *mpcs = NULL; /* FIXME */ static struct atm_mpoa_qos *qos_head = NULL; -static struct timer_list mpc_timer; +static struct timer_list mpc_timer = TIMER_INITIALIZER(NULL, 0, 0); static struct mpoa_client *find_mpc_by_itfnum(int itf) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 8fd802a39be6..085a6679d620 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1151,8 +1151,8 @@ void neigh_table_init(struct neigh_table *tbl) tasklet_init(&tbl->gc_task, SMP_TIMER_NAME(neigh_periodic_timer), (unsigned long)tbl); #endif - init_timer(&tbl->gc_timer); tbl->lock = RW_LOCK_UNLOCKED; + init_timer(&tbl->gc_timer); tbl->gc_timer.data = (unsigned long)tbl; tbl->gc_timer.function = neigh_periodic_timer; tbl->gc_timer.expires = now + tbl->gc_interval + diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 9a34ed79f9f6..16870b1d3d50 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -296,6 +296,7 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr) } memset(mc, 0, sizeof(struct ifmcaddr6)); + init_timer(&mc->mca_timer); mc->mca_timer.function = igmp6_timer_handler; mc->mca_timer.data = (unsigned long) mc; diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 3ba30d36a381..de94f7b54b20 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -2364,6 +2364,7 @@ bed: /* Set watchdog timer to expire in <val> ms. */ self->errno = 0; + init_timer(&self->watchdog); self->watchdog.function = irda_discovery_timeout; self->watchdog.data = (unsigned long) self; self->watchdog.expires = jiffies + (val * HZ/1000); diff --git a/net/llc/llc_main.c b/net/llc/llc_main.c index ae9477ecd8f1..c36f8a10fc97 100644 --- a/net/llc/llc_main.c +++ b/net/llc/llc_main.c @@ -181,18 +181,22 @@ int llc_sk_init(struct sock* sk) llc->inc_cntr = llc->dec_cntr = 2; llc->dec_step = llc->connect_step = 1; + init_timer(&llc->ack_timer); llc->ack_timer.expire = LLC_ACK_TIME; llc->ack_timer.timer.data = (unsigned long)sk; llc->ack_timer.timer.function = llc_conn_ack_tmr_cb; + init_timer(&llc->pf_cycle_timer); llc->pf_cycle_timer.expire = LLC_P_TIME; llc->pf_cycle_timer.timer.data = (unsigned long)sk; llc->pf_cycle_timer.timer.function = llc_conn_pf_cycle_tmr_cb; + init_timer(&llc->rej_sent_timer); llc->rej_sent_timer.expire = LLC_REJ_TIME; llc->rej_sent_timer.timer.data = (unsigned long)sk; llc->rej_sent_timer.timer.function = llc_conn_rej_tmr_cb; + init_timer(&llc->busy_state_timer); llc->busy_state_timer.expire = LLC_BUSY_TIME; llc->busy_state_timer.timer.data = (unsigned long)sk; llc->busy_state_timer.timer.function = llc_conn_busy_tmr_cb; @@ -552,6 +556,7 @@ static int __init llc_init(void) skb_queue_head_init(&llc_main_station.mac_pdu_q); skb_queue_head_init(&llc_main_station.ev_q.list); spin_lock_init(&llc_main_station.ev_q.lock); + init_timer(&llc_main_station.ack_timer); llc_main_station.ack_timer.data = (unsigned long)&llc_main_station; llc_main_station.ack_timer.function = llc_station_ack_tmr_cb; diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 154f2a2d0065..2007f1c8cb65 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -411,9 +411,9 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt) struct sfq_sched_data *q = (struct sfq_sched_data *)sch->data; int i; + init_timer(&q->perturb_timer); q->perturb_timer.data = (unsigned long)sch; q->perturb_timer.function = sfq_perturbation; - init_timer(&q->perturb_timer); for (i=0; i<SFQ_HASH_DIVISOR; i++) q->ht[i] = SFQ_DEPTH; |