diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2012-01-11 13:59:45 +0400 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 19:01:25 +0400 |
| commit | 75b93b59ad625d734b1c7d7e05bf6b9898c8c28f (patch) | |
| tree | fd57ebd9987b118fb53a16620add52ef7a544abf /include/net/bluetooth/l2cap.h | |
| parent | 8b281b9c7820b054d15cf471c418fd884cbbec78 (diff) | |
| download | linux-75b93b59ad625d734b1c7d7e05bf6b9898c8c28f.tar.xz | |
Bluetooth: Make l2cap_clear_timer return if timer was running or not
This is usefull when need to make action after timer was cleared
depending on if it was running or not.
Signed-off-by: Szymon Janc <szymon.janc@tieto.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 26486e182f55..238daf84184c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -616,11 +616,16 @@ static inline void l2cap_set_timer(struct l2cap_chan *chan, schedule_delayed_work(work, timeout); } -static inline void l2cap_clear_timer(struct l2cap_chan *chan, +static inline bool l2cap_clear_timer(struct l2cap_chan *chan, struct delayed_work *work) { - if (__cancel_delayed_work(work)) + bool ret; + + ret = __cancel_delayed_work(work); + if (ret) l2cap_chan_put(chan); + + return ret; } #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) |