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

Commit 4b0b2f08 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth 

Conflicts:
	net/bluetooth/l2cap_core.c
parents 4dad9992 d7660918

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
		goto encrypt;



auth:

	if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))

	if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))

		return 0;



	if (!hci_conn_auth(conn, sec_level, auth_type))

net/bluetooth/l2cap_core.c

+11 −1
Original line number Diff line number Diff line
@@ -2416,7 +2416,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi 
	void *ptr = req->data;

	int type, olen;

	unsigned long val;

	struct l2cap_conf_rfc rfc;

	struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };

	struct l2cap_conf_efs efs;



	BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
@@ -2566,6 +2566,16 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len) 
		}

	}



	/* Use sane default values in case a misbehaving remote device

	 * did not send an RFC option.

	 */

	rfc.mode = chan->mode;

	rfc.retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);

	rfc.monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);

	rfc.max_pdu_size = cpu_to_le16(chan->imtu);



	BT_ERR("Expected RFC option was not found, using defaults");



done:

	switch (rfc.mode) {

	case L2CAP_MODE_ERTM:

net/bluetooth/rfcomm/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1162,6 +1162,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci) 
			if (list_empty(&s->dlcs)) {

				s->state = BT_DISCONN;

				rfcomm_send_disc(s, 0);

				rfcomm_session_clear_timer(s);

			}



			break;