diff --git a/nanostack/ws_management_api.h b/nanostack/ws_management_api.h index 25566a21e8b..cbee2e9de1f 100644 --- a/nanostack/ws_management_api.h +++ b/nanostack/ws_management_api.h @@ -227,13 +227,13 @@ typedef struct ws_neighbour_info { /** - * @brief ws_management_pcap_t Wi-SUN FAN 1.1 Phy Capability type and opeartion mode + * @brief ws_management_pcap_t Wi-SUN FAN 1.1 Phy Capability type and operating mode */ typedef struct ws_management_pcap { /** Phy type */ uint8_t phy_type; - /** Phy operation mode */ - uint16_t operation_mode; + /** Phy operating mode */ + uint16_t operating_mode; } ws_management_pcap_t; /** diff --git a/source/6LoWPAN/ws/ws_common_defines.h b/source/6LoWPAN/ws/ws_common_defines.h index dbbfbfbd640..fa73a96ef61 100644 --- a/source/6LoWPAN/ws/ws_common_defines.h +++ b/source/6LoWPAN/ws/ws_common_defines.h @@ -245,7 +245,7 @@ typedef struct ws_panid_ie { */ typedef struct ws_pcap_ie { unsigned phy_type: 3; - uint16_t operation_mode; + uint16_t operating_mode; } ws_pcap_ie_t; typedef struct ws_phy_cap_info { diff --git a/source/6LoWPAN/ws/ws_ie_lib.c b/source/6LoWPAN/ws/ws_ie_lib.c index 4317c325718..343123c9505 100644 --- a/source/6LoWPAN/ws/ws_ie_lib.c +++ b/source/6LoWPAN/ws/ws_ie_lib.c @@ -561,7 +561,7 @@ uint8_t *ws_wp_nested_pcap_write(uint8_t *ptr, struct ws_phy_cap_info *pcap_list *ptr++ = pcap_list->length_of_list; for (int i = 0; i < pcap_list->length_of_list; i++) { *ptr++ = pcap_list->pcap[i].phy_type; - ptr = common_write_16_bit_inverse(pcap_list->pcap[i].operation_mode, ptr); + ptr = common_write_16_bit_inverse(pcap_list->pcap[i].operating_mode, ptr); } return ptr; } @@ -1175,7 +1175,7 @@ bool ws_wp_nested_pcap_read(uint8_t *data, uint16_t length, struct ws_phy_cap_in for (uint8_t i = 0; i < length_of_cap; i++) { ws_pcap_list->pcap[i].phy_type = *data++ & 7; - ws_pcap_list->pcap[i].operation_mode = common_read_16_bit_inverse(data); + ws_pcap_list->pcap[i].operating_mode = common_read_16_bit_inverse(data); data += 2; } diff --git a/source/6LoWPAN/ws/ws_management_api.c b/source/6LoWPAN/ws/ws_management_api.c index 4e5f5f6e570..c39f6bced0a 100644 --- a/source/6LoWPAN/ws/ws_management_api.c +++ b/source/6LoWPAN/ws/ws_management_api.c @@ -973,7 +973,7 @@ int ws_management_phy_capability_set( cur->ws_info->phy_cap_info.length_of_list = pcap_list->length_of_list; for (int i = 0; i < pcap_list->length_of_list; i++) { cur->ws_info->phy_cap_info.pcap[i].phy_type = pcap_list->pcap[i].phy_type; - cur->ws_info->phy_cap_info.pcap[i].operation_mode = pcap_list->pcap[i].operation_mode; + cur->ws_info->phy_cap_info.pcap[i].operating_mode = pcap_list->pcap[i].operating_mode; } return 0;