@@ -122,7 +122,7 @@ static mpx_user_t * ws_llc_mpx_user_discover(mpx_class_t *mpx_class, uint16_t us
122
122
static llc_data_base_t * ws_llc_base_allocate (void );
123
123
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 );
124
124
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 );
126
126
static void ws_llc_mpx_data_request (const mpx_api_t * api , const struct mcps_data_req_s * data , uint16_t user_id );
127
127
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 );
128
128
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
466
466
467
467
}
468
468
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 )
470
470
{
471
471
//TODO add WS_WP_NESTED_IE support
472
- uint16_t over_head_size = 0 ;
472
+ uint16_t header_size = 0 ;
473
473
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
475
475
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 ;
477
477
}
478
478
479
479
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 ;
481
481
}
482
482
} else if (MPX_KEY_MANAGEMENT_ENC_USER_ID ) {
483
- over_head_size += 7 + 5 + 2 ;
483
+ header_size += 7 + 5 + 2 ;
484
484
}
485
485
486
- return over_head_size ;
486
+ return header_size ;
487
487
}
488
488
489
489
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_
604
604
return 0 ;
605
605
}
606
606
607
- return ws_mpx_over_head_size_get (base , user_id );
607
+ return ws_mpx_header_size_get (base , user_id );
608
608
}
609
609
610
610
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