diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:58 +0300 |
| commit | 62137364e3e8afcc745846c5c67cacf943149073 (patch) | |
| tree | 42f2bdee6b16e383b6e0a94cb3abc62f335d721a /include/net/lapb.h | |
| parent | 6c80408a8a0360fa9223b8c21c0ab8ef42e88bfe (diff) | |
| parent | dcc0b49040c70ad827a7f3d58a21b01fdb14e749 (diff) | |
| download | linux-62137364e3e8afcc745846c5c67cacf943149073.tar.xz | |
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/lapb.h')
| -rw-r--r-- | include/net/lapb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/lapb.h b/include/net/lapb.h index ccc3d1f020b0..eee73442a1ba 100644 --- a/include/net/lapb.h +++ b/include/net/lapb.h @@ -92,6 +92,7 @@ struct lapb_cb { unsigned short n2, n2count; unsigned short t1, t2; struct timer_list t1timer, t2timer; + bool t1timer_stop, t2timer_stop; /* Internal control information */ struct sk_buff_head write_queue; @@ -103,6 +104,7 @@ struct lapb_cb { struct lapb_frame frmr_data; unsigned char frmr_type; + spinlock_t lock; refcount_t refcnt; }; |