Skip to content

Bluetooth: L2CAP: ECRED fixes #33305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Mar 17, 2021
Merged

Bluetooth: L2CAP: ECRED fixes #33305

merged 3 commits into from
Mar 17, 2021

Conversation

Vudentz
Copy link
Contributor

@Vudentz Vudentz commented Mar 12, 2021

No description provided.

@github-actions github-actions bot added area: Bluetooth area: Bluetooth Host Bluetooth Host (excluding BR/EDR) labels Mar 12, 2021
jhedberg
jhedberg approved these changes Mar 12, 2021
View reviewed changes
Copy link
Member

@jhedberg jhedberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be backported to stable releases? If so, please add the appropriate labels.

@Vudentz Vudentz added the Backport Backport PR and backport failure issues label Mar 13, 2021
@jhedberg
Copy link
Member

@Vudentz which releases should this be backported to? Please add the labels for those (the automatic backport PR creation works again, but not for the generic "Backport" label)

Vudentz added 2 commits March 16, 2021 09:56
@Vudentz
Bluetooth: L2CAP: Fix not checking for L2CAP_ECRED_CHAN_MAX
c654fd0 
When receiving L2CAP_CREDIT_BASED_CONNECTION_REQ the remote may request
more channels than allowed so this checks if amount of channel surpasses
the maximum channels (5) and return an error.

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
@Vudentz
Bluetooth: L2CAP: Fix invalid BT_L2CAP_ECRED_CONN_RSP
f912814 
For errors that means all connections have been refused there is no need
to add dcids since none will be valid.

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
@Vudentz
Bluetooth: L2CAP: Fix not including all DCIDs
69e29b2 
The order of Destination CIDs shall correspond the order of Source CIDs
including its amount so errors that don't result in all connection being
refused shall not break the order of CIDs.

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
@Vudentz
Copy link
Contributor Author

Vudentz commented Mar 16, 2021

@Vudentz which releases should this be backported to? Please add the labels for those (the automatic backport PR creation works again, but not for the generic "Backport" label)

Ive added the version where ECRED support has already been introduced.

@joerchan
Copy link
Contributor

AFAIK ECRED was first introduced in the 2.3 release, should we add it there as well?

@carlescufi
Copy link
Member

AFAIK ECRED was first introduced in the 2.3 release, should we add it there as well?

Backports only go back 2 releases.

@carlescufi carlescufi merged commit 06e18c6 into zephyrproject-rtos:master Mar 17, 2021
This was referenced Mar 17, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhedberg jhedberg jhedberg approved these changes

+1 more reviewer

@joerchan joerchan joerchan approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
area: Bluetooth Host Bluetooth Host (excluding BR/EDR) area: Bluetooth Backport Backport PR and backport failure issues
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Vudentz @jhedberg @joerchan @carlescufi