riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ieee802154/submac: fix inconsistent state on NO_ACK

Browse Source
This commit is contained in:
Jose Alamos 2020-10-27 17:41:43 +01:00
parent 5e7ee01755
commit c663ca0b36
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net/link_layer/ieee802154/submac.c
View File

@ -36,6 +36,7 @@ static void _tx_end(ieee802154_submac_t *submac, int status,
ieee802154_radio_request_set_trx_state(dev, submac->state == IEEE802154_STATE_LISTEN ? IEEE802154_TRX_STATE_RX_ON : IEEE802154_TRX_STATE_TRX_OFF); ieee802154_radio_request_set_trx_state(dev, submac->state == IEEE802154_STATE_LISTEN ? IEEE802154_TRX_STATE_RX_ON : IEEE802154_TRX_STATE_TRX_OFF);
submac->wait_for_ack = false;
submac->tx = false; submac->tx = false;
while (ieee802154_radio_confirm_set_trx_state(dev) == -EAGAIN) {} while (ieee802154_radio_confirm_set_trx_state(dev) == -EAGAIN) {}
submac->cb->tx_done(submac, status, info); submac->cb->tx_done(submac, status, info);
@ -160,7 +161,6 @@ void ieee802154_submac_rx_done_cb(ieee802154_submac_t *submac)
ieee802154_tx_info_t tx_info; ieee802154_tx_info_t tx_info;
tx_info.retrans = submac->retrans; tx_info.retrans = submac->retrans;
bool fp = (ack[0] & IEEE802154_FCF_FRAME_PEND); bool fp = (ack[0] & IEEE802154_FCF_FRAME_PEND);
submac->wait_for_ack = false;
ieee802154_radio_set_rx_mode(submac->dev, ieee802154_radio_set_rx_mode(submac->dev,
IEEE802154_RX_AACK_ENABLED); IEEE802154_RX_AACK_ENABLED);
_tx_end(submac, fp ? TX_STATUS_FRAME_PENDING : TX_STATUS_SUCCESS, _tx_end(submac, fp ? TX_STATUS_FRAME_PENDING : TX_STATUS_SUCCESS,
@ -228,7 +228,6 @@ static void _handle_tx_no_ack(ieee802154_submac_t *submac)
if (ieee802154_radio_has_frame_retrans(dev)) { if (ieee802154_radio_has_frame_retrans(dev)) {
ieee802154_radio_request_set_trx_state(dev, IEEE802154_TRX_STATE_RX_ON); ieee802154_radio_request_set_trx_state(dev, IEEE802154_TRX_STATE_RX_ON);
submac->wait_for_ack = false;
_tx_end(submac, TX_STATUS_NO_ACK, NULL); _tx_end(submac, TX_STATUS_NO_ACK, NULL);
} }
else { else {