From 678717d406523d84e2d93be7a4981f5ce8e1d37d Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Mon, 11 Feb 2008 21:38:32 -0800 Subject: [PATCH] --- yaml --- r: 85641 b: refs/heads/master c: e848b583e03306f5f9b3a66a793c37e3649e04ca h: refs/heads/master i: 85639: aa50f79f2f38806c44cda25d03c82f721ba35e20 v: v3 --- [refs] | 2 +- trunk/include/net/ax25.h | 1 + trunk/net/ax25/ax25_dev.c | 2 +- trunk/net/ax25/ax25_ds_timer.c | 12 ++++-------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 87dc928ca4f9..619f89968659 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21fab4a86a411c18c6b4d663ae710ca1f6206b3c +refs/heads/master: e848b583e03306f5f9b3a66a793c37e3649e04ca diff --git a/trunk/include/net/ax25.h b/trunk/include/net/ax25.h index 3f0236f1d23e..717e2192d521 100644 --- a/trunk/include/net/ax25.h +++ b/trunk/include/net/ax25.h @@ -324,6 +324,7 @@ extern void ax25_dama_on(ax25_cb *); extern void ax25_dama_off(ax25_cb *); /* ax25_ds_timer.c */ +extern void ax25_ds_setup_timer(ax25_dev *); extern void ax25_ds_set_timer(ax25_dev *); extern void ax25_ds_del_timer(ax25_dev *); extern void ax25_ds_timer(ax25_cb *); diff --git a/trunk/net/ax25/ax25_dev.c b/trunk/net/ax25/ax25_dev.c index 528c874d9828..a7a0e0c9698b 100644 --- a/trunk/net/ax25/ax25_dev.c +++ b/trunk/net/ax25/ax25_dev.c @@ -82,7 +82,7 @@ void ax25_dev_device_up(struct net_device *dev) ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT; #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) - init_timer(&ax25_dev->dama.slave_timer); + ax25_ds_setup_timer(ax25_dev); #endif spin_lock_bh(&ax25_dev_lock); diff --git a/trunk/net/ax25/ax25_ds_timer.c b/trunk/net/ax25/ax25_ds_timer.c index c4e3b025d21c..2ce79df00680 100644 --- a/trunk/net/ax25/ax25_ds_timer.c +++ b/trunk/net/ax25/ax25_ds_timer.c @@ -40,13 +40,10 @@ static void ax25_ds_timeout(unsigned long); * 1/10th of a second. */ -static void ax25_ds_add_timer(ax25_dev *ax25_dev) +void ax25_ds_setup_timer(ax25_dev *ax25_dev) { - struct timer_list *t = &ax25_dev->dama.slave_timer; - t->data = (unsigned long) ax25_dev; - t->function = &ax25_ds_timeout; - t->expires = jiffies + HZ; - add_timer(t); + setup_timer(&ax25_dev->dama.slave_timer, ax25_ds_timeout, + (unsigned long)ax25_dev); } void ax25_ds_del_timer(ax25_dev *ax25_dev) @@ -60,10 +57,9 @@ void ax25_ds_set_timer(ax25_dev *ax25_dev) if (ax25_dev == NULL) /* paranoia */ return; - del_timer(&ax25_dev->dama.slave_timer); ax25_dev->dama.slave_timeout = msecs_to_jiffies(ax25_dev->values[AX25_VALUES_DS_TIMEOUT]) / 10; - ax25_ds_add_timer(ax25_dev); + mod_timer(&ax25_dev->dama.slave_timer, jiffies + HZ); } /*