Skip to content

Commit 9205bdf

Browse files
authored
Merge pull request #12490 from DavidLin1577/patch-3
Fixed error of structure mlme_key_descriptor_t
2 parents 1e24c00 + 20f6a83 commit 9205bdf

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static int mac_sec_mib_frame_counter_key_buffer_allocate(protocol_interface_rf_m
9090
mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
9191
uint32_t *frame_counter_pointer = rf_mac_setup->key_device_frame_counter_list_buffer;
9292
for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
93-
key_descriptor_list->KeyDeviceFrameCouterList = frame_counter_pointer;
93+
key_descriptor_list->KeyDeviceFrameCounterList = frame_counter_pointer;
9494
key_descriptor_list->KeyFrameCounterPerKey = true;
9595
key_descriptor_list->KeyFrameCounter = 0;
9696
//Update Pointers
@@ -105,7 +105,7 @@ static void mac_sec_mib_frame_counter_key_buffer_free(protocol_interface_rf_mac_
105105
{
106106
mlme_key_descriptor_t *key_descriptor_list = rf_mac_setup->key_description_table;
107107
for (uint8_t i = 0; i < rf_mac_setup->key_description_table_size; i++) {
108-
key_descriptor_list->KeyDeviceFrameCouterList = NULL;
108+
key_descriptor_list->KeyDeviceFrameCounterList = NULL;
109109
key_descriptor_list->KeyFrameCounterPerKey = false;
110110
//Update Pointers
111111
key_descriptor_list++;
@@ -349,7 +349,7 @@ int8_t mac_sec_mib_key_description_set(uint8_t atribute_index, mlme_key_descript
349349
key_ptr->KeyFrameCounter = 0;
350350
if (key_ptr->KeyDeviceListEntries == 0) {
351351
//Clear all frame counters from old possible user's
352-
uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCouterList;
352+
uint32_t *counter_ptr = key_ptr->KeyDeviceFrameCounterList;
353353
for (int i = 0; i < rf_mac_setup->device_description_table_size; i++) {
354354
*counter_ptr++ = 0;
355355
}
@@ -594,7 +594,7 @@ void mac_sec_mib_key_outgoing_frame_counter_decrement(struct protocol_interface_
594594
void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint32_t frame_counter, uint8_t attribute_index)
595595
{
596596
if (key_descpription_table->KeyFrameCounterPerKey) {
597-
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index;
597+
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
598598
*counter_ptr = frame_counter;
599599
} else {
600600
device_info->FrameCounter = frame_counter;
@@ -604,7 +604,7 @@ void mac_sec_mib_key_device_frame_counter_set(mlme_key_descriptor_t *key_descpri
604604
uint32_t mac_mib_key_device_frame_counter_get(mlme_key_descriptor_t *key_descpription_table, mlme_device_descriptor_t *device_info, uint8_t attribute_index)
605605
{
606606
if (key_descpription_table->KeyFrameCounterPerKey) {
607-
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCouterList + attribute_index;
607+
uint32_t *counter_ptr = key_descpription_table->KeyDeviceFrameCounterList + attribute_index;
608608
return *counter_ptr;
609609
}
610610
return device_info->FrameCounter;

features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_security_mib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typedef struct mlme_key_descriptor_s {
2727
mlme_key_id_lookup_descriptor_t *KeyIdLookupList;
2828
mlme_key_device_descriptor_t *KeyDeviceList;
2929
mlme_key_usage_descriptor_t *KeyUsageList;
30-
uint32_t *KeyDeviceFrameCouterList;
30+
uint32_t *KeyDeviceFrameCounterList;
3131
uint32_t KeyFrameCounter;
3232
uint8_t Key[16];
3333
uint8_t KeyDeviceListSize;

0 commit comments

Comments
 (0)