[nrf fromtree] cherry-picking adv-timeout from upstream #638
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
martintv
force-pushed
the
cherry_picking_adv_timeout_from_upstream
branch
10 times, most recently
from
d369754 to
4568136
Compare
martintv
changed the title
carlescufi
requested changes
Oct 25, 2021
Contributor
carlescufi
left a comment
carlescufi
left a comment
There was a problem hiding this comment.
- This is not a cherry-pick. A
git cherry-pickpreserves the commit intact - The second commit is not
fromtreeis it? Where does it come from?
martintv
force-pushed
the
cherry_picking_adv_timeout_from_upstream
branch
2 times, most recently
from
d495a32 to
b9c6d47
Compare
carlescufi
approved these changes
Oct 25, 2021
carlescufi
requested changes
Oct 25, 2021
Contributor
carlescufi
left a comment
carlescufi
left a comment
There was a problem hiding this comment.
Please do not split commit titles into multiple lines.
carlescufi
approved these changes
Oct 25, 2021
martintv
force-pushed
the
cherry_picking_adv_timeout_from_upstream
branch
from
b9c6d47 to
77dfab1
Compare
In limited advertising advertising should end after certain timeout. Previously, limited advertising was just general advertising with BT_LE_AD_LIMITED flag set. Now, if this flag is set the work is scheduled, that will disable advertising after timeout. This affects tests GAP/DISC/LIMM/BV-03-C and GAP/DISC/LIMM/BV-04-C Signed-off-by: Krzysztof Kopyściński <[email protected]> (cherry picked from commit 4f80fe8) Signed-off-by: Martin Tverdal <[email protected]>
…vertiser Fix bug in adv timeout for limited advertiser when extended advertising features has been enabled. The advertiser was only stopped when configured as an extended advertiser. It should be stopped when configured as a legacy advertiser also. Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit 2a2523c) Signed-off-by: Martin Tverdal <[email protected]>
Fixes wrong ASSERT usage cause abnormal failed. Signed-off-by: Lingao Meng <[email protected]> (cherry picked from commit c85640e) Signed-off-by: Martin Tverdal <[email protected]>
Call bt_le_adv_stop() if adv == bt_dev.adv (Meaning it is the legacy advertiser and was started with bt_le_adv_start()), otherwise use bt_le_ext_adv_stop(), because it was started with bt_le_ext_adv_start(). Failing to stop advertising shouldn't result in assert. Signed-off-by: Michał Narajowski <[email protected]> (cherry picked from commit cca76f1) Signed-off-by: Martin Tverdal <[email protected]>
…tising stopped Advertising might stop when: - it was stopped by application - device connected to a peer - extended advertising reached stop condition defined in BT_LE_EXT_ADV_START_PARAM - this is handled in ll Signed-off-by: Michał Narajowski <[email protected]> (cherry picked from commit a9db9a3) Signed-off-by: Martin Tverdal <[email protected]>
martintv
force-pushed
the
cherry_picking_adv_timeout_from_upstream
branch
from
77dfab1 to
79903fc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment i mostly for myself in case I need to do this again to fix something:
Commands used when cherry-picking:
git cherry-pick -s -x 4f80fe8
git cherry-pick -s -x 2a2523c
git cherry-pick -s -x c85640e
git cherry-pick -s -x cca76f1
git cherry-pick -s -x a9db9a3
Also, link to PR bringing this into NCS nrfconnect/sdk-nrf#5898