| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.17 103/146] Bluetooth: 6lowpan: Increase the connection timeout value | Date | Tue, 28 Oct 2014 11:34:05 +0800 |
| |
3.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
commit 2ae50d8d3aaf7154f72b44331b71f15799cdc1bb upstream.
Use the default connection timeout value defined in l2cap.h because the current timeout was too short and most of the time the connection attempts timed out.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- net/bluetooth/6lowpan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c @@ -890,7 +890,7 @@ static void chan_resume_cb(struct l2cap_ static long chan_get_sndtimeo_cb(struct l2cap_chan *chan) { - return msecs_to_jiffies(1000); + return L2CAP_CONN_TIMEOUT; } static const struct l2cap_ops bt_6lowpan_chan_ops = {
|