diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-10 07:30:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-10 07:30:34 -0400 |
| commit | b0d369dbad20a8c9702607e7294d63c4a0c8e0fe (patch) | |
| tree | eb9bca1fb71a69ffe8f15f701ea8524b34ddaf07 /net/lapb/lapb_timer.c | |
| parent | f8ace04d2abae708595964244a759fbe21962014 (diff) | |
| parent | fc85704c3dae5ac1cb3c94045727241cd72871ff (diff) | |
Merge v6.15.2
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/lapb/lapb_timer.c')
| -rw-r--r-- | net/lapb/lapb_timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 5be68869064de..5b3f3b444d197 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -35,7 +35,7 @@ static void lapb_t2timer_expiry(struct timer_list *); void lapb_start_t1timer(struct lapb_cb *lapb) { - del_timer(&lapb->t1timer); + timer_delete(&lapb->t1timer); lapb->t1timer.function = lapb_t1timer_expiry; lapb->t1timer.expires = jiffies + lapb->t1; @@ -46,7 +46,7 @@ void lapb_start_t1timer(struct lapb_cb *lapb) void lapb_start_t2timer(struct lapb_cb *lapb) { - del_timer(&lapb->t2timer); + timer_delete(&lapb->t2timer); lapb->t2timer.function = lapb_t2timer_expiry; lapb->t2timer.expires = jiffies + lapb->t2; @@ -58,13 +58,13 @@ void lapb_start_t2timer(struct lapb_cb *lapb) void lapb_stop_t1timer(struct lapb_cb *lapb) { lapb->t1timer_running = false; - del_timer(&lapb->t1timer); + timer_delete(&lapb->t1timer); } void lapb_stop_t2timer(struct lapb_cb *lapb) { lapb->t2timer_running = false; - del_timer(&lapb->t2timer); + timer_delete(&lapb->t2timer); } int lapb_t1timer_running(struct lapb_cb *lapb) |