diff options
| author | Juergen Gross <jgross@suse.com> | 2018-01-29 17:54:46 +0300 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-01-29 17:54:46 +0300 |
| commit | ddb9e13af3bba3f8c36ccee0eb9563a82b425c12 (patch) | |
| tree | b0ad38578f597063b61a849965dfaaae7927829e /net/lapb/lapb_iface.c | |
| parent | 3a485c2be49dde899e506684bb5f06d5b3f73e82 (diff) | |
| parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) | |
| download | linux-ddb9e13af3bba3f8c36ccee0eb9563a82b425c12.tar.xz | |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'net/lapb/lapb_iface.c')
| -rw-r--r-- | net/lapb/lapb_iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c index e15314e3b464..db6e0afe3a20 100644 --- a/net/lapb/lapb_iface.c +++ b/net/lapb/lapb_iface.c @@ -127,8 +127,8 @@ static struct lapb_cb *lapb_create_cb(void) skb_queue_head_init(&lapb->write_queue); skb_queue_head_init(&lapb->ack_queue); - init_timer(&lapb->t1timer); - init_timer(&lapb->t2timer); + timer_setup(&lapb->t1timer, NULL, 0); + timer_setup(&lapb->t2timer, NULL, 0); lapb->t1 = LAPB_DEFAULT_T1; lapb->t2 = LAPB_DEFAULT_T2; |