Skip to content

Commit 3702f57

Browse files
Juha Heiskanenjuhhei01
authored andcommitted
LLC data indication and fhss channel set update
LLC data indication only accept data trough when GTK hash is configured. Channel set is not accepted middle of ACK send operation. Change-Id: I662fbcd7891c933e0194c1532bc05679e7929498
1 parent 9c9b9e3 commit 3702f57

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

source/6LoWPAN/ws/ws_llc_data_service.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,9 @@ static void ws_llc_mac_indication_cb(const mac_api_t* api, const mcps_data_ind_t
475475
}
476476

477477
protocol_interface_info_entry_t *interface = base->interface_ptr;
478+
if (!base->ie_params.gtkhash && ws_utt.message_type == WS_FT_DATA) {
479+
return;
480+
}
478481

479482
//Discover 2 Payload Heder
480483
if (ws_utt.message_type == WS_FT_DATA || ws_utt.message_type == WS_FT_EAPOL) {

source/MAC/IEEE802_15_4/mac_fhss_callbacks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int mac_set_channel(const fhss_api_t *fhss_api, uint8_t channel_number)
7171
if (!mac_setup) {
7272
return -1;
7373
}
74-
if (mac_setup->active_pd_data_request && mac_setup->active_pd_data_request->asynch_request) {
74+
if (mac_setup->mac_ack_tx_active || (mac_setup->active_pd_data_request && mac_setup->active_pd_data_request->asynch_request)) {
7575
return -1;
7676
}
7777
return mac_mlme_rf_channel_change(mac_setup, channel_number);

0 commit comments

Comments
 (0)