summaryrefslogtreecommitdiffstats
path: root/net/ax25
diff options
context:
space:
mode:
Diffstat (limited to 'net/ax25')
-rw-r--r--net/ax25/ax25_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_timer.c b/net/ax25/ax25_timer.c
index 1aa76359b..08e190456 100644
--- a/net/ax25/ax25_timer.c
+++ b/net/ax25/ax25_timer.c
@@ -140,12 +140,12 @@ void ax25_stop_idletimer(ax25_cb *ax25)
int ax25_t1timer_running(ax25_cb *ax25)
{
- return (ax25->t1timer.prev != NULL || ax25->t1timer.next != NULL);
+ return timer_pending(&ax25->t1timer);
}
unsigned long ax25_display_timer(struct timer_list *timer)
{
- if (timer->prev == NULL && timer->next == NULL)
+ if (!timer_pending(timer))
return 0;
return timer->expires - jiffies;