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

Commit 08601469 authored by Yuri Kululin's avatar Yuri Kululin Committed by Gustavo Padovan
Browse files

Bluetooth: Fix RFCOMM RPN negotiation 



According to the ETSI 3GPP TS 07.10 the default bit rate value for RFCOMM
is 9600 bit/s. Return this bit rate in case of RPN request and accept other
sane bit rates proposed by the sender in RPM command.

Signed-off-by: default avatarYuri Kululin <ext-yuri.kululin@nokia.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent fb3d8eb4

net/bluetooth/rfcomm/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1415,8 +1415,8 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_ 
		return 0;



	if (len == 1) {

		/* This is a request, return default settings */

		bit_rate  = RFCOMM_RPN_BR_115200;

		/* This is a request, return default (according to ETSI TS 07.10) settings */

		bit_rate  = RFCOMM_RPN_BR_9600;

		data_bits = RFCOMM_RPN_DATA_8;

		stop_bits = RFCOMM_RPN_STOP_1;

		parity    = RFCOMM_RPN_PARITY_NONE;
@@ -1431,9 +1431,9 @@ static int rfcomm_recv_rpn(struct rfcomm_session *s, int cr, int len, struct sk_ 


	if (rpn->param_mask & cpu_to_le16(RFCOMM_RPN_PM_BITRATE)) {

		bit_rate = rpn->bit_rate;

		if (bit_rate != RFCOMM_RPN_BR_115200) {

		if (bit_rate > RFCOMM_RPN_BR_230400) {

			BT_DBG("RPN bit rate mismatch 0x%x", bit_rate);

			bit_rate = RFCOMM_RPN_BR_115200;

			bit_rate = RFCOMM_RPN_BR_9600;

			rpn_mask ^= RFCOMM_RPN_PM_BITRATE;

		}

	}