Skip to content

drivers: ieee802154: telink: Fix frame counter #633

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

Merged
pulin1103 merged 1 commit into from
Oct 30, 2025
Merged

drivers: ieee802154: telink: Fix frame counter #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions drivers/ieee802154/ieee802154_b9x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,20 +575,26 @@ ALWAYS_INLINE b9x_send_ack(const struct device *dev, struct ieee802154_frame *fr
size_t ack_len;
#ifdef CONFIG_IEEE802154_2015
const uint8_t *key = NULL;
uint32_t frame_cnt = b9x_mac_keys_frame_cnt_get(b9x->mac_keys, 1);
const uint8_t sec_header[] = {
uint32_t frame_cnt;
uint8_t sec_header[] = {
IEEE802154_FRAME_SECCTRL_SEC_LEVEL_5 | IEEE802154_FRAME_SECCTRL_KEY_ID_MODE_1,
frame_cnt,
frame_cnt >> 8,
frame_cnt >> 16,
frame_cnt >> 24,
0,
0,
0,
0,
1
};
uint8_t payload[frame->payload_len + 4];

if (frame->general.ver == IEEE802154_FRAME_FCF_VER_2015) {
key = b9x_mac_keys_get(b9x->mac_keys, 1);
if (key && frame->payload) {
b9x_mac_keys_frame_cnt_inc(b9x->mac_keys, 1);
frame_cnt = b9x_mac_keys_frame_cnt_get(b9x->mac_keys, 1);
sec_header[1] = frame_cnt;
sec_header[2] = frame_cnt >> 8;
sec_header[3] = frame_cnt >> 16;
sec_header[4] = frame_cnt >> 24;
memcpy(payload, frame->payload, frame->payload_len);
frame->sec_header = sec_header;
frame->sec_header_len = sizeof(sec_header);
Expand All @@ -604,15 +610,13 @@ ALWAYS_INLINE b9x_send_ack(const struct device *dev, struct ieee802154_frame *fr
rf_set_txmode();
#ifdef CONFIG_IEEE802154_2015
if (frame->sec_header) {
if (ieee802154_b9x_crypto_encrypt(key, b9x->filter_ieee_addr,
if (!ieee802154_b9x_crypto_encrypt(key, b9x->filter_ieee_addr,
frame_cnt,
IEEE802154_FRAME_SECCTRL_SEC_LEVEL_5,
ack_buf, ack_len - 4,
NULL, 0,
NULL,
&ack_buf[ack_len - 4], 4)) {
b9x_mac_keys_frame_cnt_inc(b9x->mac_keys, 1);
} else {
LOG_WRN("encrypt ack failed");
}
} else {
Expand Down Expand Up @@ -1177,6 +1181,8 @@ static int b9x_tx(const struct device *dev,
break;
}

b9x_mac_keys_frame_cnt_inc(b9x->mac_keys, key_id);

uint8_t *frame_cnt =
(uint8_t *)&frame.sec_header[IEEE802154_FRAME_LENGTH_SEC_HEADER];

Expand Down Expand Up @@ -1312,11 +1318,6 @@ static int b9x_tx(const struct device *dev,
}
b9x->ack_handler_en = false;
}
#ifdef CONFIG_IEEE802154_2015
if (!status) {
b9x_mac_keys_frame_cnt_inc(b9x->mac_keys, key_id);
}
#endif /* CONFIG_IEEE802154_2015 */

return status;
}
Expand Down
29 changes: 15 additions & 14 deletions drivers/ieee802154/ieee802154_tlx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,20 +587,26 @@ ALWAYS_INLINE tlx_send_ack(const struct device *dev, struct ieee802154_frame *fr
size_t ack_len;
#ifdef CONFIG_IEEE802154_2015
const uint8_t *key = NULL;
uint32_t frame_cnt = tlx_mac_keys_frame_cnt_get(tlx->mac_keys, 1);
const uint8_t sec_header[] = {
uint32_t frame_cnt;
uint8_t sec_header[] = {
IEEE802154_FRAME_SECCTRL_SEC_LEVEL_5 | IEEE802154_FRAME_SECCTRL_KEY_ID_MODE_1,
frame_cnt,
frame_cnt >> 8,
frame_cnt >> 16,
frame_cnt >> 24,
0,
0,
0,
0,
1
};
uint8_t payload[frame->payload_len + 4];

if (frame->general.ver == IEEE802154_FRAME_FCF_VER_2015) {
key = tlx_mac_keys_get(tlx->mac_keys, 1);
if (key && frame->payload) {
tlx_mac_keys_frame_cnt_inc(tlx->mac_keys, 1);
frame_cnt = tlx_mac_keys_frame_cnt_get(tlx->mac_keys, 1);
sec_header[1] = frame_cnt;
sec_header[2] = frame_cnt >> 8;
sec_header[3] = frame_cnt >> 16;
sec_header[4] = frame_cnt >> 24;
memcpy(payload, frame->payload, frame->payload_len);
frame->sec_header = sec_header;
frame->sec_header_len = sizeof(sec_header);
Expand All @@ -616,15 +622,13 @@ ALWAYS_INLINE tlx_send_ack(const struct device *dev, struct ieee802154_frame *fr
rf_set_txmode();
#ifdef CONFIG_IEEE802154_2015
if (frame->sec_header) {
if (ieee802154_tlx_crypto_encrypt(key, tlx->filter_ieee_addr,
if (!ieee802154_tlx_crypto_encrypt(key, tlx->filter_ieee_addr,
frame_cnt,
IEEE802154_FRAME_SECCTRL_SEC_LEVEL_5,
ack_buf, ack_len - 4,
NULL, 0,
NULL,
&ack_buf[ack_len - 4], 4)) {
tlx_mac_keys_frame_cnt_inc(tlx->mac_keys, 1);
} else {
LOG_WRN("encrypt ack failed");
}
} else {
Expand Down Expand Up @@ -1219,6 +1223,8 @@ static int tlx_tx(const struct device *dev,
break;
}

tlx_mac_keys_frame_cnt_inc(tlx->mac_keys, key_id);

uint8_t *frame_cnt =
(uint8_t *)&frame.sec_header[IEEE802154_FRAME_LENGTH_SEC_HEADER];

Expand Down Expand Up @@ -1380,11 +1386,6 @@ static int tlx_tx(const struct device *dev,
}
tlx->ack_handler_en = false;
}
#ifdef CONFIG_IEEE802154_2015
if (!status) {
tlx_mac_keys_frame_cnt_inc(tlx->mac_keys, key_id);
}
#endif /* CONFIG_IEEE802154_2015 */

return status;
}
Expand Down