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

Merge branch 'contiki' into osd

Browse source
This commit is contained in:
Harald Pichler 2014-12-29 08:20:00 +01:00
commit 9efc5d41c1
19 changed files with 63 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/powertrace/powertrace.c
View file

@ -283,7 +283,7 @@ output_sniffer(int mac_status)
add_packet_stats(OUTPUT);
}
/*---------------------------------------------------------------------------*/
#if ! NETSTACK_CONF_WITH_IPV6
#if NETSTACK_CONF_WITH_RIME
static void
sniffprint(char *prefix, int seqno)
{
@ -347,7 +347,7 @@ powertrace_printsniff(powertrace_onoff_t onoff)
break;
}
}
#endif
#endif /* NETSTACK_CONF_WITH_RIME */
/*---------------------------------------------------------------------------*/
RIME_SNIFFER(powersniff, input_sniffer, output_sniffer);
/*---------------------------------------------------------------------------*/