diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-20 07:57:26 -0500 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-20 14:06:30 -0500 |
| commit | c2ec9c1bbd17cdd1fc962f000b4ecb98c1dad830 (patch) | |
| tree | 9694fd4b5845bdbbe5676b8f010dd3062e636a27 /include/net | |
| parent | 613a1c0c595fe2f2d9148a705f140a53bc9f56e1 (diff) | |
Bluetooth: Move l2cap_{set,clear}_timer to l2cap.h
It is the only place where it is used.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index c0d168adf9be..e199c2f0e4dc 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
| @@ -595,6 +595,21 @@ enum { | |||
| 595 | FLAG_EFS_ENABLE, | 595 | FLAG_EFS_ENABLE, |
| 596 | }; | 596 | }; |
| 597 | 597 | ||
| 598 | static inline void l2cap_set_timer(struct l2cap_chan *chan, | ||
| 599 | struct delayed_work *work, long timeout) | ||
| 600 | { | ||
| 601 | BT_DBG("chan %p state %d timeout %ld", chan, chan->state, timeout); | ||
| 602 | |||
| 603 | cancel_delayed_work_sync(work); | ||
| 604 | |||
| 605 | schedule_delayed_work(work, timeout); | ||
| 606 | } | ||
| 607 | |||
| 608 | static inline void l2cap_clear_timer(struct delayed_work *work) | ||
| 609 | { | ||
| 610 | cancel_delayed_work_sync(work); | ||
| 611 | } | ||
| 612 | |||
| 598 | #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) | 613 | #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) |
| 599 | #define __clear_chan_timer(c) l2cap_clear_timer(&c->chan_timer) | 614 | #define __clear_chan_timer(c) l2cap_clear_timer(&c->chan_timer) |
| 600 | #define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \ | 615 | #define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \ |
