giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #609 from adamdunkels/push/csma-fix 

CSMA bugfix: count transmissions correctly
This commit is contained in:
Nicolas Tsiftes 2014-03-28 17:27:30 +01:00
parent c2db3a1a14 5b1a9f5bc2
commit 429024f0a1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/net/mac/csma.c
View File

@ -212,16 +212,17 @@ packet_sent(void *ptr, int status, int num_transmissions)
switch(status) { switch(status) {
case MAC_TX_OK: case MAC_TX_OK:
case MAC_TX_NOACK: case MAC_TX_NOACK:
n->transmissions++; n->transmissions += num_transmissions;
break; break;
case MAC_TX_COLLISION: case MAC_TX_COLLISION:
n->collisions++; n->collisions += num_transmissions;
break; break;
case MAC_TX_DEFERRED: case MAC_TX_DEFERRED:
n->deferrals++; n->deferrals += num_transmissions;
break; break;
} }
/* Find out what packet this callback refers to */
for(q = list_head(n->queued_packet_list); for(q = list_head(n->queued_packet_list);
q != NULL; q = list_item_next(q)) { q != NULL; q = list_item_next(q)) {
if(queuebuf_attr(q->buf, PACKETBUF_ATTR_MAC_SEQNO) == if(queuebuf_attr(q->buf, PACKETBUF_ATTR_MAC_SEQNO) ==