diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-05-17 15:13:19 -0300 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-07-11 11:59:20 -0700 |
| commit | 446b49bee3ce865fd4a4ca1df2a749ecc6162d9a (patch) | |
| tree | 66b728de9509a0ad4f01ee1f4475eb15510f292c /include/net | |
| parent | bd69b5ae05398e0849b0dd755ce42ba60da6d9d9 (diff) | |
| download | kernel_samsung_tuna-446b49bee3ce865fd4a4ca1df2a749ecc6162d9a.zip kernel_samsung_tuna-446b49bee3ce865fd4a4ca1df2a749ecc6162d9a.tar.gz kernel_samsung_tuna-446b49bee3ce865fd4a4ca1df2a749ecc6162d9a.tar.bz2 | |
Bluetooth: keep reference if any ERTM timer is enabled
ERTM use the generic L2CAP timer functions to keep a reference to the
channel. This is useful for avoiding crashes.
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, 9 insertions, 6 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 7aaf7f7..c284be0 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -441,12 +441,15 @@ struct l2cap_pinfo { #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t)) #define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer) -#define __mod_retrans_timer() mod_timer(&chan->retrans_timer, \ - jiffies + msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO)); -#define __mod_monitor_timer() mod_timer(&chan->monitor_timer, \ - jiffies + msecs_to_jiffies(L2CAP_DEFAULT_MONITOR_TO)); -#define __mod_ack_timer() mod_timer(&chan->ack_timer, \ - jiffies + msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO)); +#define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \ + L2CAP_DEFAULT_RETRANS_TO); +#define __clear_retrans_timer(c) l2cap_clear_timer(c, &c->retrans_timer) +#define __set_monitor_timer(c) l2cap_set_timer(c, &c->monitor_timer, \ + L2CAP_DEFAULT_MONITOR_TO); +#define __clear_monitor_timer(c) l2cap_clear_timer(c, &c->monitor_timer) +#define __set_ack_timer(c) l2cap_set_timer(c, &chan->ack_timer, \ + L2CAP_DEFAULT_ACK_TO); +#define __clear_ack_timer(c) l2cap_clear_timer(c, &c->ack_timer) static inline int l2cap_tx_window_full(struct l2cap_chan *ch) { |