net/rose: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
83a37b3292
commit
4966babd90
@@ -104,8 +104,8 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
|
||||
|
||||
skb_queue_head_init(&rose_neigh->queue);
|
||||
|
||||
init_timer(&rose_neigh->ftimer);
|
||||
init_timer(&rose_neigh->t0timer);
|
||||
timer_setup(&rose_neigh->ftimer, NULL, 0);
|
||||
timer_setup(&rose_neigh->t0timer, NULL, 0);
|
||||
|
||||
if (rose_route->ndigis != 0) {
|
||||
rose_neigh->digipeat =
|
||||
@@ -390,8 +390,8 @@ void rose_add_loopback_neigh(void)
|
||||
|
||||
skb_queue_head_init(&sn->queue);
|
||||
|
||||
init_timer(&sn->ftimer);
|
||||
init_timer(&sn->t0timer);
|
||||
timer_setup(&sn->ftimer, NULL, 0);
|
||||
timer_setup(&sn->t0timer, NULL, 0);
|
||||
|
||||
spin_lock_bh(&rose_neigh_list_lock);
|
||||
sn->next = rose_neigh_list;
|
||||
|
||||
Reference in New Issue
Block a user