commit
93ee1edc92
|
@ -85,7 +85,7 @@
|
||||||
|
|
||||||
/* macMaxFrameRetries: Maximum number of re-transmissions attampts. Range 0--7 */
|
/* macMaxFrameRetries: Maximum number of re-transmissions attampts. Range 0--7 */
|
||||||
#ifdef CSMA_CONF_MAX_FRAME_RETRIES
|
#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
|
#else
|
||||||
#define CSMA_MAX_FRAME_RETRIES 7
|
#define CSMA_MAX_FRAME_RETRIES 7
|
||||||
#endif
|
#endif
|
||||||
|
@ -403,7 +403,7 @@ noack(struct packet_queue *q, struct neighbor_queue *n, int num_transmissions)
|
||||||
static void
|
static void
|
||||||
tx_ok(struct packet_queue *q, struct neighbor_queue *n, int num_transmissions)
|
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;
|
n->transmissions += num_transmissions;
|
||||||
tx_done(MAC_TX_OK, q, n);
|
tx_done(MAC_TX_OK, q, n);
|
||||||
}
|
}
|
||||||
|
@ -493,7 +493,7 @@ csma_output_packet(mac_callback_t sent, void *ptr)
|
||||||
/* Init neighbor entry */
|
/* Init neighbor entry */
|
||||||
linkaddr_copy(&n->addr, addr);
|
linkaddr_copy(&n->addr, addr);
|
||||||
n->transmissions = 0;
|
n->transmissions = 0;
|
||||||
n->collisions = CSMA_MIN_BE;
|
n->collisions = 0;
|
||||||
/* Init packet queue for this neighbor */
|
/* Init packet queue for this neighbor */
|
||||||
LIST_STRUCT_INIT(n, packet_queue);
|
LIST_STRUCT_INIT(n, packet_queue);
|
||||||
/* Add neighbor to the neighbor list */
|
/* Add neighbor to the neighbor list */
|
||||||
|
|
Loading…
Reference in New Issue