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

Commit 33f24048 authored by Frédéric Dalleau's avatar Frédéric Dalleau Committed by Gustavo Padovan
Browse files

Bluetooth: Remove unused mask parameter in sco_conn_defer_accept 



From Bluetooth Core v4.0 specification, 7.1.8 Accept Connection Request
Command "When accepting synchronous connection request, the Role
parameter is not used and will be ignored by the BR/EDR Controller."

Signed-off-by: default avatarFrédéric Dalleau <frederic.dalleau@linux.intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent e660ed6c

net/bluetooth/sco.c

+3 −7
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	return err;

}



static void sco_conn_defer_accept(struct hci_conn *conn, int mask)

static void sco_conn_defer_accept(struct hci_conn *conn)

{

	struct hci_dev *hdev = conn->hdev;
@@ -663,11 +663,7 @@ static void sco_conn_defer_accept(struct hci_conn *conn, int mask) 
		struct hci_cp_accept_conn_req cp;



		bacpy(&cp.bdaddr, &conn->dst);



		if (lmp_rswitch_capable(hdev) && (mask & HCI_LM_MASTER))

			cp.role = 0x00; /* Become master */

		else

			cp.role = 0x01; /* Remain slave */

		cp.role = 0x00; /* Ignored */



		hci_send_cmd(hdev, HCI_OP_ACCEPT_CONN_REQ, sizeof(cp), &cp);

	} else {
@@ -697,7 +693,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 


	if (sk->sk_state == BT_CONNECT2 &&

	    test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {

		sco_conn_defer_accept(pi->conn->hcon, 0);

		sco_conn_defer_accept(pi->conn->hcon);

		sk->sk_state = BT_CONFIG;

		msg->msg_namelen = 0;