From dec19626e811e1e1d5a1d94962b0c765027b3385 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Fri, 7 May 2010 20:45:16 +0000 Subject: [PATCH] Adjusted UIP_CONF_EXTERNAL_BUFFER to apply to actual buffer only. --- core/net/uip.c | 7 ++++--- core/net/uip6.c | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/net/uip.c b/core/net/uip.c index d6e5d92cc..274fc51c1 100644 --- a/core/net/uip.c +++ b/core/net/uip.c @@ -41,7 +41,7 @@ * * This file is part of the uIP TCP/IP stack. * - * $Id: uip.c,v 1.25 2010/05/05 13:07:45 joxe Exp $ + * $Id: uip.c,v 1.26 2010/05/07 20:45:16 oliverschmidt Exp $ * */ @@ -128,9 +128,10 @@ struct uip_eth_addr uip_ethaddr = {{0,0,0,0,0,0}}; #ifndef UIP_CONF_EXTERNAL_BUFFER static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4]; -uint8_t * const uip_buf = (uint8_t * const)uip_buf32; /* The packet buffer that contains - incoming packets. */ #endif /* UIP_CONF_EXTERNAL_BUFFER */ +uint8_t * const uip_buf = (uint8_t * const)uip_buf32; + /* The packet buffer that contains + incoming packets. */ void *uip_appdata; /* The uip_appdata pointer points to application data. */ diff --git a/core/net/uip6.c b/core/net/uip6.c index 1da8ddcfb..a8b5c6b22 100644 --- a/core/net/uip6.c +++ b/core/net/uip6.c @@ -41,7 +41,7 @@ * * This file is part of the uIP TCP/IP stack. * - * $Id: uip6.c,v 1.21 2010/05/05 13:07:45 joxe Exp $ + * $Id: uip6.c,v 1.22 2010/05/07 20:45:16 oliverschmidt Exp $ * */ @@ -170,12 +170,11 @@ u8_t uip_ext_opt_offset = 0; */ /** Packet buffer for incoming and outgoing packets */ #ifndef UIP_CONF_EXTERNAL_BUFFER - static uint32_t uip_buf32[(UIP_BUFSIZE + 3) / 4]; -uint8_t * const uip_buf = (uint8_t * const) uip_buf32; - #endif /* UIP_CONF_EXTERNAL_BUFFER */ +uint8_t * const uip_buf = (uint8_t * const) uip_buf32; + /* The uip_appdata pointer points to application data. */ void *uip_appdata; /* The uip_appdata pointer points to the application data which is to be sent*/