deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make max queueing time depend on retransmission timeout

Browse source
This commit is contained in:
adamdunkels 2010-02-28 14:15:58 +00:00
parent e06acc4525
commit ec928a2a19
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/net/rime/collect.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.c,v 1.34 2010/02/28 09:18:01 adamdunkels Exp $ * $Id: collect.c,v 1.35 2010/02/28 14:15:58 adamdunkels Exp $
*/ */
/** /**
@ -85,7 +85,8 @@ struct ack_msg {
static struct recent_packet recent_packets[NUM_RECENT_PACKETS]; static struct recent_packet recent_packets[NUM_RECENT_PACKETS];
static uint8_t recent_packet_ptr; static uint8_t recent_packet_ptr;
#define FORWARD_PACKET_LIFETIME (CLOCK_SECOND * 16) #define REXMIT_TIME CLOCK_SECOND * 2
#define FORWARD_PACKET_LIFETIME (6 * (REXMIT_TIME) << 3)
#define MAX_SENDING_QUEUE 6 #define MAX_SENDING_QUEUE 6
PACKETQUEUE(sending_queue, MAX_SENDING_QUEUE); PACKETQUEUE(sending_queue, MAX_SENDING_QUEUE);
@ -108,10 +109,6 @@ PACKETQUEUE(sending_queue, MAX_SENDING_QUEUE);
#define PRINTF(...) #define PRINTF(...)
#endif #endif
#define REXMIT_TIME CLOCK_SECOND * 2
#if CONTIKI_TARGET_NETSIM #if CONTIKI_TARGET_NETSIM
#include "ether.h" #include "ether.h"
#endif /* CONTIKI_TARGET_NETSIM */ #endif /* CONTIKI_TARGET_NETSIM */