From 9630245cda3b81230b81402e7f4a96ef939f7c3e Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Thu, 5 Apr 2018 01:55:53 -0700 Subject: [PATCH 1/2] CSMA: reset collision count to 0, not CSMA_MIN_BE --- os/net/mac/csma/csma-output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/os/net/mac/csma/csma-output.c b/os/net/mac/csma/csma-output.c index 74803ecf1..46862fa6a 100644 --- a/os/net/mac/csma/csma-output.c +++ b/os/net/mac/csma/csma-output.c @@ -403,7 +403,7 @@ noack(struct packet_queue *q, struct neighbor_queue *n, int num_transmissions) static void tx_ok(struct packet_queue *q, struct neighbor_queue *n, int num_transmissions) { - n->collisions = CSMA_MIN_BE; + n->collisions = 0; n->transmissions += num_transmissions; tx_done(MAC_TX_OK, q, n); } @@ -493,7 +493,7 @@ csma_output_packet(mac_callback_t sent, void *ptr) /* Init neighbor entry */ linkaddr_copy(&n->addr, addr); n->transmissions = 0; - n->collisions = CSMA_MIN_BE; + n->collisions = 0; /* Init packet queue for this neighbor */ LIST_STRUCT_INIT(n, packet_queue); /* Add neighbor to the neighbor list */ From c56d11502b6773681863d191640bd756ab43bd23 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Thu, 5 Apr 2018 08:53:46 -0700 Subject: [PATCH 2/2] CSMA: fix configuration bug --- os/net/mac/csma/csma-output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/net/mac/csma/csma-output.c b/os/net/mac/csma/csma-output.c index 46862fa6a..d3493ebe5 100644 --- a/os/net/mac/csma/csma-output.c +++ b/os/net/mac/csma/csma-output.c @@ -85,7 +85,7 @@ /* macMaxFrameRetries: Maximum number of re-transmissions attampts. Range 0--7 */ #ifdef CSMA_CONF_MAX_FRAME_RETRIES -#define CSMA_MAX_FRAME_RETRIES CSMA_MAX_FRAME_RETRIES +#define CSMA_MAX_FRAME_RETRIES CSMA_CONF_MAX_FRAME_RETRIES #else #define CSMA_MAX_FRAME_RETRIES 7 #endif