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)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 9 Sep 2014 13:51:47 +0000 (15:51 +0200)
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>
Cc: stable@vger.kernel.org # 3.17.x
net/bluetooth/6lowpan.c

index 35ebe79c87b0ca5df9a76ad0ea7761c433cf1fe0..5532e6e804f053fef9edad00bec92e32599d40de 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 = {