Skip to content

Bluetooth: Mesh: Fixes Friend Add Another Update #21026

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
merged 1 commit into from
Dec 14, 2019
Merged

Bluetooth: Mesh: Fixes Friend Add Another Update #21026

merged 1 commit into from
Dec 14, 2019

Conversation

LingaoM
Copy link
Collaborator

@LingaoM LingaoM commented Nov 27, 2019

Fixes: #20746

According MESH/NODE/FRND/FN/BV-20-C should add another
Friend Update.

Signed-off-by: Lingao Meng [email protected]

@zephyrbot
Copy link
Collaborator

zephyrbot commented Nov 27, 2019

All checks passed.

checkpatch (informational only, not a failure)

-:82: WARNING:LONG_LINE: line over 80 characters
#82: FILE: subsys/bluetooth/mesh/friend.c:1148:
+	BT_DBG("Update Previous Friend Update MD 0x%02x -> 0x%02x", upd->md, md);

- total: 0 errors, 1 warnings, 106 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Your patch has style problems, please review.

NOTE: Ignored message types: AVOID_EXTERNS BRACES CONFIG_EXPERIMENTAL CONST_STRUCT DATE_TIME FILE_PATH_CHANGES MINMAX NETWORKING_BLOCK_COMMENT_STYLE PRINTK_WITHOUT_KERN_LEVEL SPLIT_STRING VOLATILE

NOTE: If any of the errors are false positives, please report
      them to the maintainers.

Tip: The bot edits this comment instead of posting a new one, so you can check the comment's history to see earlier messages.

@jhedberg
Copy link
Member

@LingoMeng could you fix the build issue? Quoting from Shippable:

/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c: In function 'update_overwrite':
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c:1204:10: error: 'return' with a value, in function returning void [-Werror]
   return false;
          ^~~~~
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c:1198:13: note: declared here
 static void update_overwrite(struct net_buf *buf)
             ^~~~~~~~~~~~~~~~
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c:1217:6: error: 'src' undeclared (first use in this function)
  if (src != net_buf_pull_be16(buf)) {
      ^~~
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c:1217:6: note: each undeclared identifier is reported only once for each function it appears in
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c: In function 'add_update':
/home/buildslave/src/github.com/zephyrproject-rtos/zephyr/subsys/bluetooth/mesh/friend.c:1243:42: error: expected ';' before '}' token
   update_overwrite((struct net_buf *)cur)
                                          ^
                                          ;
  }                                       

Copy link
Collaborator

@trond-snekvik trond-snekvik left a comment

Choose a reason for hiding this comment

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

@trond-snekvik trond-snekvik added this to the v2.2.0 milestone Dec 2, 2019
@trond-snekvik trond-snekvik added the bug The issue is a bug, or the PR is fixing a bug label Dec 2, 2019
@joerchan joerchan added the area: Bluetooth Qualification Bluetooth Qualification -related issues and pull requests label Dec 2, 2019
@LingaoM LingaoM requested a review from trond-snekvik December 5, 2019 11:24
@joerchan
Copy link
Collaborator

@LingoMeng You have build errors. See shippable.

Fixes: #20746

According MESH/NODE/FRND/FN/BV-20-C should add another
Friend Update.

Signed-off-by: Lingao Meng <[email protected]>
@jhedberg jhedberg merged commit 6e260af into zephyrproject-rtos:master Dec 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Bluetooth Mesh area: Bluetooth Qualification Bluetooth Qualification -related issues and pull requests area: Bluetooth bug The issue is a bug, or the PR is fixing a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bluetooth: Mesh: Friend node Adding another Friend Update
5 participants