Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sys/net/gnrc_sixlowpan_frag_sfr: use xtimer_set #17668

Merged
merged 1 commit into from
Feb 17, 2022
Merged

sys/net/gnrc_sixlowpan_frag_sfr: use xtimer_set #17668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions sys/net/gnrc/network_layer/sixlowpan/frag/sfr/gnrc_sixlowpan_frag_sfr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static char addr_str[GNRC_NETIF_HDR_L2ADDR_PRINT_LEN];
#endif /* MODULE_GNRC_IPV6_NIB */

static evtimer_msg_t _arq_timer;
static xtimer_t _if_gap_timer = { .offset = 0, .long_offset = 0 };
static xtimer_t _if_gap_timer = { 0 };
static msg_t _if_gap_msg = { .type = GNRC_SIXLOWPAN_FRAG_SFR_INTER_FRAG_GAP_MSG };
static uint32_t _last_frame_sent = 0U;

Expand Down Expand Up @@ -1481,8 +1481,7 @@ static void _sched_next_frame(void)
{
if (CONFIG_GNRC_SIXLOWPAN_SFR_INTER_FRAME_GAP_US > 0) {
int state = irq_disable(); /* make timer check atomic */
bool already_set = (_if_gap_timer.offset ||
_if_gap_timer.long_offset);
bool already_set = xtimer_is_set(&_if_gap_timer);

irq_restore(state);
if (!already_set) {
Expand Down