| Message ID | 20200323203458.24733-3-luiz.dentz@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Marcel Holtmann |
| Headers | show |
| Series | Enable use of L2CAP_MODE_EXT_FLOWCTL | expand |
Hi Luiz, > This uses the DEFER_SETUP flag to group channels with > L2CAP_CREDIT_BASED_CONNECTION_REQ. > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > --- > include/net/bluetooth/l2cap.h | 4 + > net/bluetooth/l2cap_core.c | 136 +++++++++++++++++++++++++++++++--- > 2 files changed, 130 insertions(+), 10 deletions(-) > > diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h > index 2d7d28474d34..dada14d0622c 100644 > --- a/include/net/bluetooth/l2cap.h > +++ b/include/net/bluetooth/l2cap.h > @@ -47,6 +47,7 @@ > #define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF > #define L2CAP_BREDR_MAX_PAYLOAD 1019 /* 3-DH5 packet */ > #define L2CAP_LE_MIN_MTU 23 > +#define L2CAP_ECRED_CONN_SCID_MAX 5 > > #define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100) > #define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000) > @@ -984,6 +985,9 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan); > int l2cap_ertm_init(struct l2cap_chan *chan); > void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); > void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); > +typedef void (*l2cap_chan_func_t)(struct l2cap_chan *chan, void *data); > +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > + void *data); > 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); > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 5e6e35ab44dd..9f699d09d973 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -678,6 +678,29 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) > } > EXPORT_SYMBOL_GPL(l2cap_chan_del); > > +static void __l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > + void *data) > +{ > + struct l2cap_chan *chan; > + > + list_for_each_entry(chan, &conn->chan_l, list) { > + func(chan, data); > + } > +} > + > +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > + void *data) > +{ > + if (!conn) > + return; > + > + mutex_lock(&conn->chan_lock); > + __l2cap_chan_list(conn, func, data); > + mutex_unlock(&conn->chan_lock); > +} > + > +EXPORT_SYMBOL_GPL(l2cap_chan_list); > + > static void l2cap_conn_update_id_addr(struct work_struct *work) > { > struct l2cap_conn *conn = container_of(work, struct l2cap_conn, > @@ -1356,29 +1379,79 @@ static void l2cap_le_connect(struct l2cap_chan *chan) > sizeof(req), &req); > } > > -static void l2cap_ecred_connect(struct l2cap_chan *chan) > -{ > - struct l2cap_conn *conn = chan->conn; > +struct l2cap_ecred_conn_data { > struct { > struct l2cap_ecred_conn_req req; > - __le16 scid; > + __le16 scid[5]; > } __packed pdu; > + struct l2cap_chan *chan; > + struct pid *pid; > + int count; > +}; > + > +static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) > +{ > + struct l2cap_ecred_conn_data *conn = data; > + struct pid *pid; > + > + if (chan == conn->chan) > + return; > + > + if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) > + return; > + > + pid = chan->ops->get_peer_pid(chan); > + > + /* Only add deferred channels with the same PID/PSM */ > + if (conn->pid != pid || chan->psm != conn->chan->psm || chan->ident || > + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) > + return; > + > + if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) > + return; > + > + l2cap_ecred_init(chan, 0); > + > + /* Set the same ident so we can match on the rsp */ > + chan->ident = conn->chan->ident; > + > + /* Include all channels deferred */ > + conn->pdu.scid[conn->count] = cpu_to_le16(chan->scid); > + > + conn->count++; > +} > + > +static void l2cap_ecred_connect(struct l2cap_chan *chan) > +{ > + struct l2cap_conn *conn = chan->conn; > + struct l2cap_ecred_conn_data data; > + > + if (test_bit(FLAG_DEFER_SETUP, &chan->flags)) > + return; > > if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) > return; > > l2cap_ecred_init(chan, 0); > > - pdu.req.psm = chan->psm; > - pdu.req.mtu = cpu_to_le16(chan->imtu); > - pdu.req.mps = cpu_to_le16(chan->mps); > - pdu.req.credits = cpu_to_le16(chan->rx_credits); > - pdu.scid = cpu_to_le16(chan->scid); > + data.pdu.req.psm = chan->psm; > + data.pdu.req.mtu = cpu_to_le16(chan->imtu); > + data.pdu.req.mps = cpu_to_le16(chan->mps); > + data.pdu.req.credits = cpu_to_le16(chan->rx_credits); > + data.pdu.scid[0] = cpu_to_le16(chan->scid); > > chan->ident = l2cap_get_ident(conn); > + data.pid = chan->ops->get_peer_pid(chan); > + > + data.count = 1; > + data.chan = chan; > + data.pid = chan->ops->get_peer_pid(chan); > + > + __l2cap_chan_list(conn, l2cap_ecred_defer_connect, &data); > > l2cap_send_cmd(conn, chan->ident, L2CAP_ECRED_CONN_REQ, > - sizeof(pdu), &pdu); > + sizeof(data.pdu.req) + data.count * sizeof(__le16), > + &data.pdu); > } > > static void l2cap_le_start(struct l2cap_chan *chan) > @@ -7694,6 +7767,33 @@ static bool is_valid_psm(u16 psm, u8 dst_type) { > return ((psm & 0x0101) == 0x0001); > } > > +struct l2cap_chan_data { > + struct l2cap_chan *chan; > + struct pid *pid; > + int count; > +}; > + > +static void l2cap_chan_by_pid(struct l2cap_chan *chan, void *data) > +{ > + struct l2cap_chan_data *d = data; > + struct pid *pid; > + > + if (chan == d->chan) > + return; > + > + if (!test_bit(FLAG_DEFER_SETUP, &chan->flags)) > + return; > + > + pid = chan->ops->get_peer_pid(chan); > + > + /* Only count deferred channels with the same PID/PSM */ > + if (d->pid != pid || chan->psm != d->chan->psm || chan->ident || > + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) > + return; > + > + d->count++; > +} > + > int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, > bdaddr_t *dst, u8 dst_type) > { > @@ -7813,6 +7913,22 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, > goto done; > } > > + if (chan->mode == L2CAP_MODE_EXT_FLOWCTL) { > + struct l2cap_chan_data data; > + > + data.chan = chan; > + data.pid = chan->ops->get_peer_pid(chan); > + data.count = 0; > + > + l2cap_chan_list(conn, l2cap_chan_by_pid, &data); Put an empty line after this. It gives emphasis to the comment. > + /* Check if there isn't too many channels being connected */ > + if (!(data.count < L2CAP_ECRED_CONN_SCID_MAX - 1)) { If (data.count > L2CAP_ECRED_CONN_SCID_MIX) ??? > + hci_conn_drop(hcon); > + err = -EPROTO; > + goto done; > + } > + } > + > mutex_lock(&conn->chan_lock); > l2cap_chan_lock(chan); Regards Marcel
Hi Marcel, On Tue, Mar 24, 2020 at 1:47 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Luiz, > > > This uses the DEFER_SETUP flag to group channels with > > L2CAP_CREDIT_BASED_CONNECTION_REQ. > > > > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > --- > > include/net/bluetooth/l2cap.h | 4 + > > net/bluetooth/l2cap_core.c | 136 +++++++++++++++++++++++++++++++--- > > 2 files changed, 130 insertions(+), 10 deletions(-) > > > > diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h > > index 2d7d28474d34..dada14d0622c 100644 > > --- a/include/net/bluetooth/l2cap.h > > +++ b/include/net/bluetooth/l2cap.h > > @@ -47,6 +47,7 @@ > > #define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF > > #define L2CAP_BREDR_MAX_PAYLOAD 1019 /* 3-DH5 packet */ > > #define L2CAP_LE_MIN_MTU 23 > > +#define L2CAP_ECRED_CONN_SCID_MAX 5 > > > > #define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100) > > #define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000) > > @@ -984,6 +985,9 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan); > > int l2cap_ertm_init(struct l2cap_chan *chan); > > void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); > > void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); > > +typedef void (*l2cap_chan_func_t)(struct l2cap_chan *chan, void *data); > > +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > > + void *data); > > 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); > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > > index 5e6e35ab44dd..9f699d09d973 100644 > > --- a/net/bluetooth/l2cap_core.c > > +++ b/net/bluetooth/l2cap_core.c > > @@ -678,6 +678,29 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) > > } > > EXPORT_SYMBOL_GPL(l2cap_chan_del); > > > > +static void __l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > > + void *data) > > +{ > > + struct l2cap_chan *chan; > > + > > + list_for_each_entry(chan, &conn->chan_l, list) { > > + func(chan, data); > > + } > > +} > > + > > +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, > > + void *data) > > +{ > > + if (!conn) > > + return; > > + > > + mutex_lock(&conn->chan_lock); > > + __l2cap_chan_list(conn, func, data); > > + mutex_unlock(&conn->chan_lock); > > +} > > + > > +EXPORT_SYMBOL_GPL(l2cap_chan_list); > > + > > static void l2cap_conn_update_id_addr(struct work_struct *work) > > { > > struct l2cap_conn *conn = container_of(work, struct l2cap_conn, > > @@ -1356,29 +1379,79 @@ static void l2cap_le_connect(struct l2cap_chan *chan) > > sizeof(req), &req); > > } > > > > -static void l2cap_ecred_connect(struct l2cap_chan *chan) > > -{ > > - struct l2cap_conn *conn = chan->conn; > > +struct l2cap_ecred_conn_data { > > struct { > > struct l2cap_ecred_conn_req req; > > - __le16 scid; > > + __le16 scid[5]; > > } __packed pdu; > > + struct l2cap_chan *chan; > > + struct pid *pid; > > + int count; > > +}; > > + > > +static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) > > +{ > > + struct l2cap_ecred_conn_data *conn = data; > > + struct pid *pid; > > + > > + if (chan == conn->chan) > > + return; > > + > > + if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) > > + return; > > + > > + pid = chan->ops->get_peer_pid(chan); > > + > > + /* Only add deferred channels with the same PID/PSM */ > > + if (conn->pid != pid || chan->psm != conn->chan->psm || chan->ident || > > + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) > > + return; > > + > > + if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) > > + return; > > + > > + l2cap_ecred_init(chan, 0); > > + > > + /* Set the same ident so we can match on the rsp */ > > + chan->ident = conn->chan->ident; > > + > > + /* Include all channels deferred */ > > + conn->pdu.scid[conn->count] = cpu_to_le16(chan->scid); > > + > > + conn->count++; > > +} > > + > > +static void l2cap_ecred_connect(struct l2cap_chan *chan) > > +{ > > + struct l2cap_conn *conn = chan->conn; > > + struct l2cap_ecred_conn_data data; > > + > > + if (test_bit(FLAG_DEFER_SETUP, &chan->flags)) > > + return; > > > > if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) > > return; > > > > l2cap_ecred_init(chan, 0); > > > > - pdu.req.psm = chan->psm; > > - pdu.req.mtu = cpu_to_le16(chan->imtu); > > - pdu.req.mps = cpu_to_le16(chan->mps); > > - pdu.req.credits = cpu_to_le16(chan->rx_credits); > > - pdu.scid = cpu_to_le16(chan->scid); > > + data.pdu.req.psm = chan->psm; > > + data.pdu.req.mtu = cpu_to_le16(chan->imtu); > > + data.pdu.req.mps = cpu_to_le16(chan->mps); > > + data.pdu.req.credits = cpu_to_le16(chan->rx_credits); > > + data.pdu.scid[0] = cpu_to_le16(chan->scid); > > > > chan->ident = l2cap_get_ident(conn); > > + data.pid = chan->ops->get_peer_pid(chan); > > + > > + data.count = 1; > > + data.chan = chan; > > + data.pid = chan->ops->get_peer_pid(chan); > > + > > + __l2cap_chan_list(conn, l2cap_ecred_defer_connect, &data); > > > > l2cap_send_cmd(conn, chan->ident, L2CAP_ECRED_CONN_REQ, > > - sizeof(pdu), &pdu); > > + sizeof(data.pdu.req) + data.count * sizeof(__le16), > > + &data.pdu); > > } > > > > static void l2cap_le_start(struct l2cap_chan *chan) > > @@ -7694,6 +7767,33 @@ static bool is_valid_psm(u16 psm, u8 dst_type) { > > return ((psm & 0x0101) == 0x0001); > > } > > > > +struct l2cap_chan_data { > > + struct l2cap_chan *chan; > > + struct pid *pid; > > + int count; > > +}; > > + > > +static void l2cap_chan_by_pid(struct l2cap_chan *chan, void *data) > > +{ > > + struct l2cap_chan_data *d = data; > > + struct pid *pid; > > + > > + if (chan == d->chan) > > + return; > > + > > + if (!test_bit(FLAG_DEFER_SETUP, &chan->flags)) > > + return; > > + > > + pid = chan->ops->get_peer_pid(chan); > > + > > + /* Only count deferred channels with the same PID/PSM */ > > + if (d->pid != pid || chan->psm != d->chan->psm || chan->ident || > > + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) > > + return; > > + > > + d->count++; > > +} > > + > > int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, > > bdaddr_t *dst, u8 dst_type) > > { > > @@ -7813,6 +7913,22 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, > > goto done; > > } > > > > + if (chan->mode == L2CAP_MODE_EXT_FLOWCTL) { > > + struct l2cap_chan_data data; > > + > > + data.chan = chan; > > + data.pid = chan->ops->get_peer_pid(chan); > > + data.count = 0; > > + > > + l2cap_chan_list(conn, l2cap_chan_by_pid, &data); > > Put an empty line after this. It gives emphasis to the comment. > > > + /* Check if there isn't too many channels being connected */ > > + if (!(data.count < L2CAP_ECRED_CONN_SCID_MAX - 1)) { > > If (data.count > L2CAP_ECRED_CONN_SCID_MIX) ??? We need to take into account the chan itself is not part of the list yet, so that means data.count + 1 or we initialize the it as 1 a couple lines before, I will change the logic to use > operation. > > + hci_conn_drop(hcon); > > + err = -EPROTO; > > + goto done; > > + } > > + } > > + > > mutex_lock(&conn->chan_lock); > > l2cap_chan_lock(chan); > > Regards > > Marcel >
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 2d7d28474d34..dada14d0622c 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -47,6 +47,7 @@ #define L2CAP_DEFAULT_ACC_LAT 0xFFFFFFFF #define L2CAP_BREDR_MAX_PAYLOAD 1019 /* 3-DH5 packet */ #define L2CAP_LE_MIN_MTU 23 +#define L2CAP_ECRED_CONN_SCID_MAX 5 #define L2CAP_DISC_TIMEOUT msecs_to_jiffies(100) #define L2CAP_DISC_REJ_TIMEOUT msecs_to_jiffies(5000) @@ -984,6 +985,9 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan); int l2cap_ertm_init(struct l2cap_chan *chan); void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); +typedef void (*l2cap_chan_func_t)(struct l2cap_chan *chan, void *data); +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data); 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); diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 5e6e35ab44dd..9f699d09d973 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -678,6 +678,29 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err) } EXPORT_SYMBOL_GPL(l2cap_chan_del); +static void __l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data) +{ + struct l2cap_chan *chan; + + list_for_each_entry(chan, &conn->chan_l, list) { + func(chan, data); + } +} + +void l2cap_chan_list(struct l2cap_conn *conn, l2cap_chan_func_t func, + void *data) +{ + if (!conn) + return; + + mutex_lock(&conn->chan_lock); + __l2cap_chan_list(conn, func, data); + mutex_unlock(&conn->chan_lock); +} + +EXPORT_SYMBOL_GPL(l2cap_chan_list); + static void l2cap_conn_update_id_addr(struct work_struct *work) { struct l2cap_conn *conn = container_of(work, struct l2cap_conn, @@ -1356,29 +1379,79 @@ static void l2cap_le_connect(struct l2cap_chan *chan) sizeof(req), &req); } -static void l2cap_ecred_connect(struct l2cap_chan *chan) -{ - struct l2cap_conn *conn = chan->conn; +struct l2cap_ecred_conn_data { struct { struct l2cap_ecred_conn_req req; - __le16 scid; + __le16 scid[5]; } __packed pdu; + struct l2cap_chan *chan; + struct pid *pid; + int count; +}; + +static void l2cap_ecred_defer_connect(struct l2cap_chan *chan, void *data) +{ + struct l2cap_ecred_conn_data *conn = data; + struct pid *pid; + + if (chan == conn->chan) + return; + + if (!test_and_clear_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; + + pid = chan->ops->get_peer_pid(chan); + + /* Only add deferred channels with the same PID/PSM */ + if (conn->pid != pid || chan->psm != conn->chan->psm || chan->ident || + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) + return; + + if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) + return; + + l2cap_ecred_init(chan, 0); + + /* Set the same ident so we can match on the rsp */ + chan->ident = conn->chan->ident; + + /* Include all channels deferred */ + conn->pdu.scid[conn->count] = cpu_to_le16(chan->scid); + + conn->count++; +} + +static void l2cap_ecred_connect(struct l2cap_chan *chan) +{ + struct l2cap_conn *conn = chan->conn; + struct l2cap_ecred_conn_data data; + + if (test_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; if (test_and_set_bit(FLAG_ECRED_CONN_REQ_SENT, &chan->flags)) return; l2cap_ecred_init(chan, 0); - pdu.req.psm = chan->psm; - pdu.req.mtu = cpu_to_le16(chan->imtu); - pdu.req.mps = cpu_to_le16(chan->mps); - pdu.req.credits = cpu_to_le16(chan->rx_credits); - pdu.scid = cpu_to_le16(chan->scid); + data.pdu.req.psm = chan->psm; + data.pdu.req.mtu = cpu_to_le16(chan->imtu); + data.pdu.req.mps = cpu_to_le16(chan->mps); + data.pdu.req.credits = cpu_to_le16(chan->rx_credits); + data.pdu.scid[0] = cpu_to_le16(chan->scid); chan->ident = l2cap_get_ident(conn); + data.pid = chan->ops->get_peer_pid(chan); + + data.count = 1; + data.chan = chan; + data.pid = chan->ops->get_peer_pid(chan); + + __l2cap_chan_list(conn, l2cap_ecred_defer_connect, &data); l2cap_send_cmd(conn, chan->ident, L2CAP_ECRED_CONN_REQ, - sizeof(pdu), &pdu); + sizeof(data.pdu.req) + data.count * sizeof(__le16), + &data.pdu); } static void l2cap_le_start(struct l2cap_chan *chan) @@ -7694,6 +7767,33 @@ static bool is_valid_psm(u16 psm, u8 dst_type) { return ((psm & 0x0101) == 0x0001); } +struct l2cap_chan_data { + struct l2cap_chan *chan; + struct pid *pid; + int count; +}; + +static void l2cap_chan_by_pid(struct l2cap_chan *chan, void *data) +{ + struct l2cap_chan_data *d = data; + struct pid *pid; + + if (chan == d->chan) + return; + + if (!test_bit(FLAG_DEFER_SETUP, &chan->flags)) + return; + + pid = chan->ops->get_peer_pid(chan); + + /* Only count deferred channels with the same PID/PSM */ + if (d->pid != pid || chan->psm != d->chan->psm || chan->ident || + chan->mode != L2CAP_MODE_EXT_FLOWCTL || chan->state != BT_CONNECT) + return; + + d->count++; +} + int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, bdaddr_t *dst, u8 dst_type) { @@ -7813,6 +7913,22 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, goto done; } + if (chan->mode == L2CAP_MODE_EXT_FLOWCTL) { + struct l2cap_chan_data data; + + data.chan = chan; + data.pid = chan->ops->get_peer_pid(chan); + data.count = 0; + + l2cap_chan_list(conn, l2cap_chan_by_pid, &data); + /* Check if there isn't too many channels being connected */ + if (!(data.count < L2CAP_ECRED_CONN_SCID_MAX - 1)) { + hci_conn_drop(hcon); + err = -EPROTO; + goto done; + } + } + mutex_lock(&conn->chan_lock); l2cap_chan_lock(chan);