diff --git a/examples/ravenusbstick/fakeuip.c b/examples/ravenusbstick/fakeuip.c index 22468e65b..fb5dc7ace 100644 --- a/examples/ravenusbstick/fakeuip.c +++ b/examples/ravenusbstick/fakeuip.c @@ -31,6 +31,7 @@ u8_t tcpip_output(uip_lladdr_t * lladdr){ } return 0; } +//Called from sicslowpan.c void tcpip_set_outputfunc(u8_t (* f)(uip_lladdr_t *)) { output = f; } diff --git a/examples/webserver-ipv6-raven/Huginn/header.html b/examples/webserver-ipv6-raven/Huginn/header.html index 1f704c04b..f6ee80682 100644 --- a/examples/webserver-ipv6-raven/Huginn/header.html +++ b/examples/webserver-ipv6-raven/Huginn/header.html @@ -3,4 +3,4 @@

Menu

Front page
Status
File statistics
Network connections
System processes
Sensor Readings

-

Welcome to the Contiki web server on Huginn!

\ No newline at end of file +

Welcome to the Contiki web server on Huginn!

diff --git a/examples/webserver-ipv6-raven/Muninn/header.html b/examples/webserver-ipv6-raven/Muninn/header.html index 6344aeb29..5d16f718e 100644 --- a/examples/webserver-ipv6-raven/Muninn/header.html +++ b/examples/webserver-ipv6-raven/Muninn/header.html @@ -3,4 +3,4 @@

Menu

Front page
Status
File statistics
Network connections
System processes
Sensor Readings

-

Welcome to the Contiki web server on Muninn!

\ No newline at end of file +

Welcome to the Contiki web server on Muninn!

diff --git a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c index 95c55471e..979aeb713 100644 --- a/platform/avr-raven/apps/raven-webserver/httpd-cgi.c +++ b/platform/avr-raven/apps/raven-webserver/httpd-cgi.c @@ -28,7 +28,7 @@ * * This file is part of the uIP TCP/IP stack. * - * $Id: httpd-cgi.c,v 1.10 2010/12/04 21:32:35 dak664 Exp $ + * $Id: httpd-cgi.c,v 1.11 2010/12/14 22:51:04 dak664 Exp $ * */ @@ -292,7 +292,6 @@ static const char httpd_cgi_addrn[] HTTPD_STRING_ATTR = "(none)
"; extern uip_ds6_nbr_t uip_ds6_nbr_cache[]; extern uip_ds6_route_t uip_ds6_routing_table[]; extern uip_ds6_netif_t uip_ds6_if; -#include "rpl.h" static unsigned short make_addresses(void *p) diff --git a/platform/avr-ravenusb/sicslow_ethernet.c b/platform/avr-ravenusb/sicslow_ethernet.c index 8ac181b6b..eea6366b6 100644 --- a/platform/avr-ravenusb/sicslow_ethernet.c +++ b/platform/avr-ravenusb/sicslow_ethernet.c @@ -310,8 +310,7 @@ void mac_ethernetSetup(void) usbstick_mode.sendToRf = 1; usbstick_mode.translate = 1; usbstick_mode.debugOn= 1; -//usbstick_mode.raw = 1; - usbstick_mode.raw = 0; //default: don't report raw frames until they are entirely correct + usbstick_mode.raw = 0; #if !RF230BB sicslowinput = pinput;