2002-11-18 14:07:51

by Petr Vandrovec

Subject: [PATCH] llc & 2.5.48

Hi,
patch below fixes couple of compilation warnings in llc.
Please apply.
Thanks,
Petr Vandrovec
[email protected]


diff -urdN linux/net/llc/llc_main.c linux/net/llc/llc_main.c
--- linux/net/llc/llc_main.c 2002-11-18 13:50:40.000000000 +0000
+++ linux/net/llc/llc_main.c 2002-11-18 13:55:51.000000000 +0000
@@ -181,22 +181,22 @@
llc->inc_cntr = llc->dec_cntr = 2;
llc->dec_step = llc->connect_step = 1;

- init_timer(&llc->ack_timer);
+ init_timer(&llc->ack_timer.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);
+ init_timer(&llc->pf_cycle_timer.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);
+ init_timer(&llc->rej_sent_timer.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);
+ init_timer(&llc->busy_state_timer.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;

2002-11-18 22:13:13

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] llc & 2.5.48

Em Mon, Nov 18, 2002 at 03:14:37PM +0100, Petr Vandrovec escreveu:
> Hi,
> patch below fixes couple of compilation warnings in llc.
> Please apply.

Thanks a lot, applied to my tree, will go to DaveM tonight.

2002-11-18 22:36:21

by David Miller

Subject: Re: [PATCH] llc & 2.5.48

On Mon, 2002-11-18 at 06:14, Petr Vandrovec wrote:
> patch below fixes couple of compilation warnings in llc.
> Please apply.

Applied, thanks.