Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f668b0 authored by Andrzej Kaczmarek's avatar Andrzej Kaczmarek Committed by Gustavo Padovan
Browse files

Bluetooth: Use miliseconds for L2CAP channel timeouts 



Timers set by __set_chan_timer() should use miliseconds instead of
jiffies. Commit 942ecc9c updated
l2cap_set_timer() so it expects timeout to be specified in msecs
instead of jiffies. This makes timeouts unreliable when CONFIG_HZ
is not set to 1000.

Signed-off-by: default avatarAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 4dff523a

include/net/bluetooth/l2cap.h

+5 −2
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
#define L2CAP_DEFAULT_ACK_TO		200

#define L2CAP_LE_DEFAULT_MTU		23



#define L2CAP_DISC_TIMEOUT             (100)

#define L2CAP_DISC_REJ_TIMEOUT         (5000)  /*  5 seconds */

#define L2CAP_ENC_TIMEOUT              (5000)  /*  5 seconds */

#define L2CAP_CONN_TIMEOUT             (40000) /* 40 seconds */

#define L2CAP_INFO_TIMEOUT             (4000)  /*  4 seconds */

net/bluetooth/l2cap_core.c

+8 −8
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void l2cap_chan_timeout(unsigned long arg) 


	if (sock_owned_by_user(sk)) {

		/* sk is owned by user. Try again later */

		__set_chan_timer(chan, HZ / 5);

		__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

		bh_unlock_sock(sk);

		chan_put(chan);

		return;
@@ -2488,7 +2488,7 @@ static inline int l2cap_connect_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hd 
		if (sock_owned_by_user(sk)) {

			l2cap_state_change(chan, BT_DISCONN);

			__clear_chan_timer(chan);

			__set_chan_timer(chan, HZ / 5);

			__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

			break;

		}
@@ -2661,7 +2661,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr 


	default:

		sk->sk_err = ECONNRESET;

		__set_chan_timer(chan, HZ * 5);

		__set_chan_timer(chan, L2CAP_DISC_REJ_TIMEOUT);

		l2cap_send_disconn_req(conn, chan, ECONNRESET);

		goto done;

	}
@@ -2718,7 +2718,7 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, struct l2cap_cmd 
	if (sock_owned_by_user(sk)) {

		l2cap_state_change(chan, BT_DISCONN);

		__clear_chan_timer(chan);

		__set_chan_timer(chan, HZ / 5);

		__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

		bh_unlock_sock(sk);

		return 0;

	}
@@ -2752,7 +2752,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd 
	if (sock_owned_by_user(sk)) {

		l2cap_state_change(chan,BT_DISCONN);

		__clear_chan_timer(chan);

		__set_chan_timer(chan, HZ / 5);

		__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

		bh_unlock_sock(sk);

		return 0;

	}
@@ -3998,7 +3998,7 @@ static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt) 
	if (encrypt == 0x00) {

		if (chan->sec_level == BT_SECURITY_MEDIUM) {

			__clear_chan_timer(chan);

			__set_chan_timer(chan, HZ * 5);

			__set_chan_timer(chan, L2CAP_ENC_TIMEOUT);

		} else if (chan->sec_level == BT_SECURITY_HIGH)

			l2cap_chan_close(chan, ECONNREFUSED);

	} else {
@@ -4066,7 +4066,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
					L2CAP_CONN_REQ, sizeof(req), &req);

			} else {

				__clear_chan_timer(chan);

				__set_chan_timer(chan, HZ / 10);

				__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

			}

		} else if (chan->state == BT_CONNECT2) {

			struct l2cap_conn_rsp rsp;
@@ -4086,7 +4086,7 @@ static int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
				}

			} else {

				l2cap_state_change(chan, BT_DISCONN);

				__set_chan_timer(chan, HZ / 10);

				__set_chan_timer(chan, L2CAP_DISC_TIMEOUT);

				res = L2CAP_CR_SEC_BLOCK;

				stat = L2CAP_CS_NO_INFO;

			}