Skip to content

Bluetooth: controller: Fix transaction collision #14636

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.

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

Merged

Conversation

joerchan
Copy link
Collaborator

Fixes: #14635

Peer side will disconnect if controller initiates
Encryption procedure before PHY update procedure
has finished.

Signed-off-by: Joakim Andersson [email protected]

Peer side will disconnect if controller initiates
Encryption procedure before PHY update procedure
has finished.

Signed-off-by: Joakim Andersson <[email protected]>
Copy link
Collaborator

@cvinayak cvinayak left a comment

Choose a reason for hiding this comment

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

LGTM

@carlescufi
Copy link
Member

@cvinayak does this need a fix in the split controller too?

@codecov-io
Copy link

Codecov Report

Merging #14636 into master will decrease coverage by 0.03%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #14636      +/-   ##
==========================================
- Coverage   52.01%   51.98%   -0.04%     
==========================================
  Files         309      309              
  Lines       45583    45584       +1     
  Branches    10555    10555              
==========================================
- Hits        23711    23696      -15     
- Misses      17068    17080      +12     
- Partials     4804     4808       +4
Impacted Files Coverage Δ
subsys/bluetooth/controller/ll_sw/ctrl.c 54.42% <50%> (ø) ⬆️
subsys/testsuite/ztest/include/ztest_assert.h 38.88% <0%> (-38.89%) ⬇️
subsys/testsuite/ztest/src/ztest.c 65.28% <0%> (-7.44%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 87b7bee...f218011. Read the comment docs.

@carlescufi carlescufi merged commit f4c8e3f into zephyrproject-rtos:master Mar 19, 2019
cvinayak added a commit to cvinayak/zephyr that referenced this pull request Jun 4, 2019
Port the fix for the controller implementation to make start
encryption queueable if there is any control procedure in
progress.

Refer to zephyrproject-rtos#15335.
Relates to zephyrproject-rtos#15335, zephyrproject-rtos#15186, zephyrproject-rtos#15958 and zephyrproject-rtos#14636.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
carlescufi pushed a commit that referenced this pull request Jun 6, 2019
Port the fix for the controller implementation to make start
encryption queueable if there is any control procedure in
progress.

Refer to #15335.
Relates to #15335, #15186, #15958 and #14636.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
@joerchan joerchan deleted the enc_phy_procedure_collision branch September 24, 2019 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants