lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Make l2cap_clear_timer return if timer was running or not

Browse Source 
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>
This commit is contained in:
Szymon Janc
2012-01-11 10:59:45 +01:00
committed by Johan Hedberg
parent 8b281b9c78
commit 75b93b59ad
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/bluetooth/l2cap.h
View File

@@ -616,11 +616,16 @@ static inline void l2cap_set_timer(struct l2cap_chan *chan,
schedule_delayed_work(work, timeout); 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) struct delayed_work *work)
{ {
if (__cancel_delayed_work(work)) bool ret;
ret = __cancel_delayed_work(work);
if (ret)
l2cap_chan_put(chan); l2cap_chan_put(chan);
return ret;
} }
#define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t))