Skip to content

Commit 15d4465

Browse files
Juha Heiskanenjuhhei01
authored andcommitted
Function and parameter rename.
1 parent 5af7992 commit 15d4465

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

source/6LoWPAN/ws/ws_llc_data_service.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static mpx_user_t * ws_llc_mpx_user_discover(mpx_class_t *mpx_class, uint16_t us
122122
static llc_data_base_t * ws_llc_base_allocate(void);
123123
static void ws_llc_mac_confirm_cb(const mac_api_t* api, const mcps_data_conf_t *data, const mcps_data_conf_payload_t *conf_data);
124124
static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t *data, const mcps_data_ie_list_t *ie_ext);
125-
static uint16_t ws_mpx_over_head_size_get(llc_data_base_t *base, uint16_t user_id);
125+
static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id);
126126
static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data_req_s *data, uint16_t user_id);
127127
static int8_t ws_llc_mpx_data_cb_register(const mpx_api_t* api, mpx_data_confirm *confirm_cb, mpx_data_indication *indication_cb, uint16_t user_id);
128128
static uint16_t ws_llc_mpx_header_size_get(const mpx_api_t * api, uint16_t user_id);
@@ -466,24 +466,24 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t
466466

467467
}
468468

469-
static uint16_t ws_mpx_over_head_size_get(llc_data_base_t *base, uint16_t user_id)
469+
static uint16_t ws_mpx_header_size_get(llc_data_base_t *base, uint16_t user_id)
470470
{
471471
//TODO add WS_WP_NESTED_IE support
472-
uint16_t over_head_size = 0;
472+
uint16_t header_size = 0;
473473
if (user_id == MPX_LOWPAN_ENC_USER_ID) {
474-
over_head_size += 7+ 5 + 2; //UTT+ MPX + Padding
474+
header_size += 7+ 5 + 2; //UTT+ MPX + Padding
475475
if (base->ie_params.vendor_header_length) {
476-
over_head_size += base->ie_params.vendor_header_length + 3;
476+
header_size += base->ie_params.vendor_header_length + 3;
477477
}
478478

479479
if (base->ie_params.vendor_payload_length) {
480-
over_head_size += base->ie_params.vendor_header_length + 4;
480+
header_size += base->ie_params.vendor_header_length + 4;
481481
}
482482
} else if (MPX_KEY_MANAGEMENT_ENC_USER_ID) {
483-
over_head_size += 7+ 5 + 2;
483+
header_size += 7+ 5 + 2;
484484
}
485485

486-
return over_head_size;
486+
return header_size;
487487
}
488488

489489
static void ws_llc_mpx_data_request(const mpx_api_t *api, const struct mcps_data_req_s *data, uint16_t user_id)
@@ -604,7 +604,7 @@ static uint16_t ws_llc_mpx_header_size_get(const mpx_api_t * api, uint16_t user_
604604
return 0;
605605
}
606606

607-
return ws_mpx_over_head_size_get(base, user_id);
607+
return ws_mpx_header_size_get(base, user_id);
608608
}
609609

610610
static void ws_llc_mpx_data_purge_request(const mpx_api_t *api, struct mcps_purge_s *purge, uint16_t user_id)

0 commit comments

Comments
 (0)