net/lapb: 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: "David S. Miller" <davem@davemloft.net> Cc: Hans Liljestrand <ishkamiel@gmail.com> Cc: "Reshetova, Elena" <elena.reshetova@intel.com> Cc: linux-x25@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:
parent
eb4ddaf474
commit
83a37b3292
|
@ -127,8 +127,8 @@ static struct lapb_cb *lapb_create_cb(void)
|
||||||
skb_queue_head_init(&lapb->write_queue);
|
skb_queue_head_init(&lapb->write_queue);
|
||||||
skb_queue_head_init(&lapb->ack_queue);
|
skb_queue_head_init(&lapb->ack_queue);
|
||||||
|
|
||||||
init_timer(&lapb->t1timer);
|
timer_setup(&lapb->t1timer, NULL, 0);
|
||||||
init_timer(&lapb->t2timer);
|
timer_setup(&lapb->t2timer, NULL, 0);
|
||||||
|
|
||||||
lapb->t1 = LAPB_DEFAULT_T1;
|
lapb->t1 = LAPB_DEFAULT_T1;
|
||||||
lapb->t2 = LAPB_DEFAULT_T2;
|
lapb->t2 = LAPB_DEFAULT_T2;
|
||||||
|
|
|
@ -35,15 +35,14 @@
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <net/lapb.h>
|
#include <net/lapb.h>
|
||||||
|
|
||||||
static void lapb_t1timer_expiry(unsigned long);
|
static void lapb_t1timer_expiry(struct timer_list *);
|
||||||
static void lapb_t2timer_expiry(unsigned long);
|
static void lapb_t2timer_expiry(struct timer_list *);
|
||||||
|
|
||||||
void lapb_start_t1timer(struct lapb_cb *lapb)
|
void lapb_start_t1timer(struct lapb_cb *lapb)
|
||||||
{
|
{
|
||||||
del_timer(&lapb->t1timer);
|
del_timer(&lapb->t1timer);
|
||||||
|
|
||||||
lapb->t1timer.data = (unsigned long)lapb;
|
lapb->t1timer.function = (TIMER_FUNC_TYPE)lapb_t1timer_expiry;
|
||||||
lapb->t1timer.function = &lapb_t1timer_expiry;
|
|
||||||
lapb->t1timer.expires = jiffies + lapb->t1;
|
lapb->t1timer.expires = jiffies + lapb->t1;
|
||||||
|
|
||||||
add_timer(&lapb->t1timer);
|
add_timer(&lapb->t1timer);
|
||||||
|
@ -53,8 +52,7 @@ void lapb_start_t2timer(struct lapb_cb *lapb)
|
||||||
{
|
{
|
||||||
del_timer(&lapb->t2timer);
|
del_timer(&lapb->t2timer);
|
||||||
|
|
||||||
lapb->t2timer.data = (unsigned long)lapb;
|
lapb->t2timer.function = (TIMER_FUNC_TYPE)lapb_t2timer_expiry;
|
||||||
lapb->t2timer.function = &lapb_t2timer_expiry;
|
|
||||||
lapb->t2timer.expires = jiffies + lapb->t2;
|
lapb->t2timer.expires = jiffies + lapb->t2;
|
||||||
|
|
||||||
add_timer(&lapb->t2timer);
|
add_timer(&lapb->t2timer);
|
||||||
|
@ -75,9 +73,9 @@ int lapb_t1timer_running(struct lapb_cb *lapb)
|
||||||
return timer_pending(&lapb->t1timer);
|
return timer_pending(&lapb->t1timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lapb_t2timer_expiry(unsigned long param)
|
static void lapb_t2timer_expiry(struct timer_list *t)
|
||||||
{
|
{
|
||||||
struct lapb_cb *lapb = (struct lapb_cb *)param;
|
struct lapb_cb *lapb = from_timer(lapb, t, t2timer);
|
||||||
|
|
||||||
if (lapb->condition & LAPB_ACK_PENDING_CONDITION) {
|
if (lapb->condition & LAPB_ACK_PENDING_CONDITION) {
|
||||||
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
|
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
|
||||||
|
@ -85,9 +83,9 @@ static void lapb_t2timer_expiry(unsigned long param)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lapb_t1timer_expiry(unsigned long param)
|
static void lapb_t1timer_expiry(struct timer_list *t)
|
||||||
{
|
{
|
||||||
struct lapb_cb *lapb = (struct lapb_cb *)param;
|
struct lapb_cb *lapb = from_timer(lapb, t, t1timer);
|
||||||
|
|
||||||
switch (lapb->state) {
|
switch (lapb->state) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue