2022-06-30 07:36:34

by Isak Westin

[permalink] [raw]
Subject: [PATCH BlueZ 1/1] mesh: Use correct net_id for received CTL messages

For received CTL mesh messages, the wrong network ID variable was
passed to ctl_received. This patch changes to the correct variable.

Also, changed type of net_key_id argument in ctl_received function
to be consistent wich the whole call chain.
---
mesh/net.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesh/net.c b/mesh/net.c
index 8ff3ef32e..e8e6d3a61 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -2028,7 +2028,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
return false;
}

-static bool ctl_received(struct mesh_net *net, uint16_t net_key_id,
+static bool ctl_received(struct mesh_net *net, uint32_t net_key_id,
uint32_t iv_index, uint8_t ttl,
uint32_t seq,
uint16_t src, uint16_t dst,
@@ -2347,7 +2347,7 @@ static enum _relay_advice packet_received(void *user_data,
net_seqZero,
l_get_be32(msg + 3));
} else {
- ctl_received(net, key_aid, iv_index, net_ttl,
+ ctl_received(net, net_key_id, iv_index, net_ttl,
net_seq, net_src, net_dst,
net_opcode, rssi, msg,
app_msg_len);
--
2.20.1


2022-06-30 08:39:37

by bluez.test.bot

[permalink] [raw]
Subject: RE: mesh: Use correct net_id in ctl_received

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=655288

---Test result---

Test Summary:
CheckPatch PASS 1.47 seconds
GitLint PASS 1.07 seconds
Prep - Setup ELL PASS 42.45 seconds
Build - Prep PASS 0.67 seconds
Build - Configure PASS 8.46 seconds
Build - Make PASS 1263.52 seconds
Make Check PASS 11.28 seconds
Make Check w/Valgrind PASS 442.87 seconds
Make Distcheck PASS 220.49 seconds
Build w/ext ELL - Configure PASS 8.13 seconds
Build w/ext ELL - Make PASS 1219.91 seconds
Incremental Build with patchesPASS 0.00 seconds



---
Regards,
Linux Bluetooth