]> git.ipfire.org Git - people/ms/linux.git/commitdiff
Bluetooth: 6lowpan: Increase the connection timeout value
authorJukka Rissanen <jukka.rissanen@linux.intel.com>
Mon, 8 Sep 2014 09:11:43 +0000 (12:11 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Oct 2014 16:43:14 +0000 (09:43 -0700)
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

index 206b65ccd5b8bd318e554e452966fae1c582112f..885636faf54f054a508974e77b0724a40578c00b 100644 (file)
@@ -890,7 +890,7 @@ static void chan_resume_cb(struct l2cap_chan *chan)
 
 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 = {