Skip to content
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

Fixed error of function 'mac_fcf_lenght' #12491

Merged
merged 1 commit into from
Feb 24, 2020
Merged

Fixed error of function 'mac_fcf_lenght' #12491

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
12 changes: 6 additions & 6 deletions features/nanostack/sal-stack-nanostack/source/MAC/IEEE802_15_4/mac_header_helper_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static uint8_t *mcps_mac_security_aux_header_start_pointer_get(const mac_pre_par
static uint8_t *mac_header_information_elements_write(const mac_pre_build_frame_t *buffer, uint8_t *ptr);


static uint8_t mac_fcf_lenght(const mac_fcf_sequence_t *header)
static uint8_t mac_fcf_length(const mac_fcf_sequence_t *header)
{
uint8_t length;
if (header->frameVersion == MAC_FRAME_VERSION_2015) {
Expand Down Expand Up @@ -298,7 +298,7 @@ static uint8_t *mac_header_write_fcf_dsn(const mac_fcf_sequence_t *header, uint8
uint16_t mac_header_off_set_to_aux_header(const mac_fcf_sequence_t *fcf)
{
//Skip first FCF & address field
uint16_t offset = mac_fcf_lenght(fcf);//Skip FCF + DSN
uint16_t offset = mac_fcf_length(fcf);//Skip FCF + DSN
offset += mac_dst_address_length_with_panid(fcf);
offset += mac_address_length(fcf->SrcAddrMode);
if (fcf->SrcPanPresents) {
Expand Down Expand Up @@ -351,7 +351,7 @@ static bool mac_header_pan_full_compressed(const mac_fcf_sequence_t *header)

static uint16_t mac_header_read_src_pan(const mac_fcf_sequence_t *header, const uint8_t *ptr)
{
ptr += mac_fcf_lenght(header);//Skip FCF + DSN
ptr += mac_fcf_length(header);//Skip FCF + DSN

ptr += mac_dst_address_length_with_panid(header); //Skip Dst panID & Address

Expand All @@ -360,7 +360,7 @@ static uint16_t mac_header_read_src_pan(const mac_fcf_sequence_t *header, const

static uint16_t mac_header_read_dst_pan(const mac_fcf_sequence_t *header, const uint8_t *ptr)
{
ptr += mac_fcf_lenght(header);//Skip FCF + DSN
ptr += mac_fcf_length(header);//Skip FCF + DSN

return common_read_16_bit_inverse(ptr);
}
Expand Down Expand Up @@ -403,7 +403,7 @@ void mac_header_get_src_address(const mac_fcf_sequence_t *header, const uint8_t
return;
}

ptr += mac_fcf_lenght(header);//Skip FCF + DSN
ptr += mac_fcf_length(header);//Skip FCF + DSN

ptr += mac_dst_address_length_with_panid(header);

Expand All @@ -430,7 +430,7 @@ void mac_header_get_dst_address(const mac_fcf_sequence_t *header, const uint8_t
}
uint8_t address_len, address_index, i;

ptr += mac_fcf_lenght(header);//Skip FCF + DSN
ptr += mac_fcf_length(header);//Skip FCF + DSN

address_len = mac_address_length(header->DstAddrMode);

Expand Down