Skip to content

Commit 0d4eb7a

Browse files
author
Juha Heiskanen
committed
Removed dead code part
1 parent fc644f5 commit 0d4eb7a

File tree

1 file changed

+0
-72
lines changed

1 file changed

+0
-72
lines changed

source/6LoWPAN/ws/ws_llc_data_service.c

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -838,78 +838,6 @@ static void ws_llc_mac_indication_cb(const mac_api_t *api, const mcps_data_ind_t
838838
if (ws_utt.message_type == WS_FT_EAPOL) {
839839
ws_llc_eapol_indication_cb(api, data, ie_ext, ws_utt);
840840
return;
841-
llc_data_base_t *base = ws_llc_mpx_frame_common_validates(api, data, ws_utt);
842-
if (!base) {
843-
return;
844-
}
845-
846-
//Discover MPX header and handler
847-
mac_payload_IE_t mpx_ie;
848-
mpx_msg_t mpx_frame;
849-
mpx_user_t *user_cb = ws_llc_mpx_header_parse(base, ie_ext, &mpx_frame, &mpx_ie);
850-
if (!user_cb) {
851-
return;
852-
}
853-
854-
mac_payload_IE_t ws_wp_nested;
855-
ws_us_ie_t us_ie;
856-
bool us_ie_inline = false;
857-
bool bs_ie_inline = false;
858-
ws_wp_nested.id = WS_WP_NESTED_IE;
859-
ws_bs_ie_t ws_bs_ie;
860-
if (mac_ie_payload_discover(ie_ext->payloadIeList, ie_ext->payloadIeListLength, &ws_wp_nested) > 2) {
861-
us_ie_inline = ws_wp_nested_us_read(ws_wp_nested.content_ptr, ws_wp_nested.length, &us_ie);
862-
bs_ie_inline = ws_wp_nested_bs_read(ws_wp_nested.content_ptr, ws_wp_nested.length, &ws_bs_ie);
863-
}
864-
865-
//Validate Unicast shedule Channel Plan
866-
if (us_ie_inline && !ws_bootstrap_validate_channel_plan(&us_ie, base->interface_ptr)) {
867-
//Channel plan configuration mismatch
868-
return;
869-
}
870-
871-
llc_neighbour_req_t neighbor_info;
872-
873-
if (!base->ws_neighbor_info_request_cb(base->interface_ptr, data->SrcAddr, &neighbor_info, true)) {
874-
//tr_debug("Drop message no neighbor");
875-
return;
876-
}
877-
878-
ws_neighbor_class_neighbor_unicast_time_info_update(neighbor_info.ws_neighbor, &ws_utt, data->timestamp);
879-
if (us_ie_inline) {
880-
ws_neighbor_class_neighbor_unicast_schedule_set(neighbor_info.ws_neighbor, &us_ie);
881-
}
882-
//Update BS if it is part of message
883-
if (bs_ie_inline) {
884-
ws_neighbor_class_neighbor_broadcast_schedule_set(neighbor_info.ws_neighbor, &ws_bs_ie);
885-
}
886-
887-
uint8_t auth_eui64[8];
888-
//Discover and write Auhtenticator EUI-64
889-
if (ws_wh_ea_read(ie_ext->headerIeList, ie_ext->headerIeListLength, auth_eui64)) {
890-
ws_pae_controller_border_router_addr_write(base->interface_ptr, auth_eui64);
891-
}
892-
893-
894-
//Update BT if it is part of message
895-
ws_bt_ie_t ws_bt;
896-
if (ws_wh_bt_read(ie_ext->headerIeList, ie_ext->headerIeListLength, &ws_bt)) {
897-
ws_neighbor_class_neighbor_broadcast_time_info_update(neighbor_info.ws_neighbor, &ws_bt, data->timestamp);
898-
if (neighbor_info.neighbor) {
899-
if (neighbor_info.neighbor->link_role == PRIORITY_PARENT_NEIGHBOUR) {
900-
// We have broadcast schedule set up set the broadcast parent schedule
901-
ns_fhss_ws_set_parent(base->interface_ptr->ws_info->fhss_api, neighbor_info.neighbor->mac64, &neighbor_info.ws_neighbor->fhss_data.bc_timing_info, false);
902-
} else {
903-
ws_bootstrap_eapol_parent_synch(base->interface_ptr, &neighbor_info);
904-
}
905-
}
906-
}
907-
908-
mcps_data_ind_t data_ind = *data;
909-
data_ind.msdu_ptr = mpx_frame.frame_ptr;
910-
data_ind.msduLength = mpx_frame.frame_length;
911-
user_cb->data_ind(&base->mpx_data_base.mpx_api, &data_ind);
912-
return;
913841
}
914842
}
915843

0 commit comments

Comments
 (0)