diff --git a/pkg/ndn-riot/patches/0001-update-xtimer_member_names.patch b/pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch similarity index 76% rename from pkg/ndn-riot/patches/0001-update-xtimer_member_names.patch rename to pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch index 40b3fa1da1..c6186522de 100644 --- a/pkg/ndn-riot/patches/0001-update-xtimer_member_names.patch +++ b/pkg/ndn-riot/patches/0001-update-xtimer_t-struct-clearing.patch @@ -1,7 +1,7 @@ -From 22f5984e32bec116e3449ebad1b29b2a18f4d93e Mon Sep 17 00:00:00 2001 +From 1534f82714a2a11bb338e14ed9dd18a24799cd38 Mon Sep 17 00:00:00 2001 From: Michel Rottleuthner Date: Thu, 9 Jan 2020 11:16:38 +0100 -Subject: [PATCH] update xtimer_t member names +Subject: [PATCH] update xtimer_t struct clearing --- app.c | 2 +- @@ -10,43 +10,44 @@ Subject: [PATCH] update xtimer_t member names 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.c b/app.c -index 8d37bd9..da9fc3c 100644 +index 8d37bd970af..bc4718d31b9 100644 --- a/app.c +++ b/app.c @@ -380,7 +380,7 @@ int ndn_app_schedule(ndn_app_t* handle, ndn_app_sched_cb_t cb, void* context, if (entry == NULL) return -1; - + // initialize the timer - entry->timer.target = entry->timer.long_target = 0; -+ entry->timer.offset = entry->timer.long_offset = 0; - ++ entry->timer = (xtimer_t) {0}; + // initialize the msg struct entry->timer_msg.type = MSG_XTIMER; diff --git a/l2.c b/l2.c -index 77d6be4..b64b9df 100644 +index 77d6be49cd9..a0546b5e4a2 100644 --- a/l2.c +++ b/l2.c @@ -155,7 +155,7 @@ ndn_shared_block_t* ndn_l2_frag_receive(kernel_pid_t iface, entry->id = id; - + // initialize timer - entry->timer.target = entry->timer.long_target = 0; -+ entry->timer.offset = entry->timer.long_offset = 0; ++ entry->timer = (xtimer_t) {0}; entry->timer_msg.type = NDN_L2_FRAG_MSG_TYPE_TIMEOUT; entry->timer_msg.content.ptr = (char*)(&entry->timer_msg); - + diff --git a/pit.c b/pit.c -index 644cf08..944a07c 100644 +index 644cf089d9c..692105ea1ed 100644 --- a/pit.c +++ b/pit.c @@ -155,7 +155,7 @@ int ndn_pit_add(kernel_pid_t face_id, int face_type, ndn_shared_block_t* si, *pit_entry = entry; - + /* initialize the timer */ - entry->timer.target = entry->timer.long_target = 0; -+ entry->timer.offset = entry->timer.long_offset = 0; - ++ entry->timer = (xtimer_t) {0}; + /* initialize the msg struct */ entry->timer_msg.type = NDN_PIT_MSG_TYPE_TIMEOUT; -- -2.24.1 +2.25.0 +