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

Merge pull request #1498 from alignan/pull/fix-ip64-warnings

Browse source 
Fix ip64 warnings and error
This commit is contained in:
Simon Duquennoy 2016-02-05 23:02:39 +01:00
parent 287092db42 c924567d86
commit 5afdae1399
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/net/ip64/ip64-eth-interface.c
View file

@ -89,7 +89,6 @@ output(void)
{ {
int len, ret; int len, ret;
printf("ip64-interface: output source "); printf("ip64-interface: output source ");
PRINT6ADDR(&UIP_IP_BUF->srcipaddr); PRINT6ADDR(&UIP_IP_BUF->srcipaddr);
PRINTF(" destination "); PRINTF(" destination ");
@ -117,6 +116,8 @@ output(void)
return IP64_ETH_DRIVER.output(ip64_packet_buffer, len); return IP64_ETH_DRIVER.output(ip64_packet_buffer, len);
} }
} }
return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct uip_fallback_interface ip64_eth_interface = { const struct uip_fallback_interface ip64_eth_interface = {

4
core/net/ip64/ip64.c
View file

@ -897,11 +897,13 @@ interface_init(void)
IP64_UIP_FALLBACK_INTERFACE.init(); IP64_UIP_FALLBACK_INTERFACE.init();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static int
interface_output(void) interface_output(void)
{ {
PRINTF("ip64: interface_output len %d\n", uip_len); PRINTF("ip64: interface_output len %d\n", uip_len);
IP64_UIP_FALLBACK_INTERFACE.output(); IP64_UIP_FALLBACK_INTERFACE.output();
return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct uip_fallback_interface ip64_uip_fallback_interface = { const struct uip_fallback_interface ip64_uip_fallback_interface = {

1
dev/enc28j60/enc28j60-ip64-driver.c
View file

@ -35,6 +35,7 @@
#include "ip64.h" #include "ip64.h"
#include "ip64-eth.h" #include "ip64-eth.h"
#include "rime.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>