Commit 3f7a56c4 authored by Mat Martineau's avatar Mat Martineau Committed by Gustavo Padovan
Browse files

Bluetooth: Start channel move when socket option is changed 



Channel moves are triggered by changes to the BT_CHANNEL_POLICY
sockopt when an ERTM or streaming-mode channel is connected.

Moves are only started if enable_hs is true.

Signed-off-by: default avatarMat Martineau <mathewm@codeaurora.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent e6a3ee6e

include/net/bluetooth/l2cap.h

+1 −0
Original line number Diff line number Diff line
@@ -809,5 +809,6 @@ void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); 
void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);

void l2cap_chan_del(struct l2cap_chan *chan, int err);

void l2cap_send_conn_req(struct l2cap_chan *chan);

void l2cap_move_start(struct l2cap_chan *chan);



#endif /* __L2CAP_H */

net/bluetooth/l2cap_core.c

+19 −0
Original line number Diff line number Diff line
@@ -4453,6 +4453,25 @@ static void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan, 
	}

}



void l2cap_move_start(struct l2cap_chan *chan)

{

	BT_DBG("chan %p", chan);



	if (chan->local_amp_id == HCI_BREDR_ID) {

		if (chan->chan_policy != BT_CHANNEL_POLICY_AMP_PREFERRED)

			return;

		chan->move_role = L2CAP_MOVE_ROLE_INITIATOR;

		chan->move_state = L2CAP_MOVE_WAIT_PREPARE;

		/* Placeholder - start physical link setup */

	} else {

		chan->move_role = L2CAP_MOVE_ROLE_INITIATOR;

		chan->move_state = L2CAP_MOVE_WAIT_RSP_SUCCESS;

		chan->move_id = 0;

		l2cap_move_setup(chan);

		l2cap_send_move_chan_req(chan, 0);

	}

}



static void l2cap_do_create(struct l2cap_chan *chan, int result,

			    u8 local_amp_id, u8 remote_amp_id)

{

net/bluetooth/l2cap_sock.c

+5 −0
Original line number Diff line number Diff line
@@ -736,6 +736,11 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, 
		}



		chan->chan_policy = (u8) opt;



		if (sk->sk_state == BT_CONNECTED &&

		    chan->move_role == L2CAP_MOVE_ROLE_NONE)

			l2cap_move_start(chan);



		break;



	default: