Commit a324fa50 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Greg Kroah-Hartman

Bluetooth: Fix not initializing L2CAP tx_credits

commit ba8f5289 upstream.

l2cap_le_flowctl_init was reseting the tx_credits which works only for
outgoing connection since that set the tx_credits on the response, for
incoming connections that was not the case which leaves the channel
without any credits causing it to be suspended.
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org # 4.20+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07e38998
...@@ -510,12 +510,12 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan) ...@@ -510,12 +510,12 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan)
} }
EXPORT_SYMBOL_GPL(l2cap_chan_set_defaults); EXPORT_SYMBOL_GPL(l2cap_chan_set_defaults);
static void l2cap_le_flowctl_init(struct l2cap_chan *chan) static void l2cap_le_flowctl_init(struct l2cap_chan *chan, u16 tx_credits)
{ {
chan->sdu = NULL; chan->sdu = NULL;
chan->sdu_last_frag = NULL; chan->sdu_last_frag = NULL;
chan->sdu_len = 0; chan->sdu_len = 0;
chan->tx_credits = 0; chan->tx_credits = tx_credits;
/* Derive MPS from connection MTU to stop HCI fragmentation */ /* Derive MPS from connection MTU to stop HCI fragmentation */
chan->mps = min_t(u16, chan->imtu, chan->conn->mtu - L2CAP_HDR_SIZE); chan->mps = min_t(u16, chan->imtu, chan->conn->mtu - L2CAP_HDR_SIZE);
/* Give enough credits for a full packet */ /* Give enough credits for a full packet */
...@@ -1281,7 +1281,7 @@ static void l2cap_le_connect(struct l2cap_chan *chan) ...@@ -1281,7 +1281,7 @@ static void l2cap_le_connect(struct l2cap_chan *chan)
if (test_and_set_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags)) if (test_and_set_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags))
return; return;
l2cap_le_flowctl_init(chan); l2cap_le_flowctl_init(chan, 0);
req.psm = chan->psm; req.psm = chan->psm;
req.scid = cpu_to_le16(chan->scid); req.scid = cpu_to_le16(chan->scid);
...@@ -5532,11 +5532,10 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn, ...@@ -5532,11 +5532,10 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
chan->dcid = scid; chan->dcid = scid;
chan->omtu = mtu; chan->omtu = mtu;
chan->remote_mps = mps; chan->remote_mps = mps;
chan->tx_credits = __le16_to_cpu(req->credits);
__l2cap_chan_add(conn, chan); __l2cap_chan_add(conn, chan);
l2cap_le_flowctl_init(chan); l2cap_le_flowctl_init(chan, __le16_to_cpu(req->credits));
dcid = chan->scid; dcid = chan->scid;
credits = chan->rx_credits; credits = chan->rx_credits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment