diff --git a/include/nuttx/net/uip.h b/include/nuttx/net/uip.h index d4a17164d9..ee396aaece 100644 --- a/include/nuttx/net/uip.h +++ b/include/nuttx/net/uip.h @@ -234,16 +234,6 @@ struct uip_callback_s * Public Function Prototypes ****************************************************************************/ -/* uIP initialization functions - * - * The uIP initialization functions are used for booting uIP. - * - * This function should be called at boot up to initialize the uIP - * TCP/IP stack. - */ - -void uip_initialize(void); - /* This function may be used at boot time to set the initial ip_id.*/ void uip_setipid(uint16_t id); diff --git a/net/Makefile b/net/Makefile index 42a6359da5..ec65af93eb 100644 --- a/net/Makefile +++ b/net/Makefile @@ -64,7 +64,7 @@ include igmp/Make.defs include tcp/Make.defs include udp/Make.defs include pkt/Make.defs -include uip/Make.defs +include devif/Make.defs include route/Make.defs include utils/Make.defs endif diff --git a/net/uip/Make.defs b/net/devif/Make.defs similarity index 85% rename from net/uip/Make.defs rename to net/devif/Make.defs index fac4c0d5df..1827136021 100644 --- a/net/uip/Make.defs +++ b/net/devif/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# net/uip/Make.defs +# net/devif/Make.defs # # Copyright (C) 2007, 2009-2010, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -33,24 +33,24 @@ # ############################################################################ -# Common IP source files +# Network device interface source files -NET_CSRCS += uip_initialize.c uip_setipid.c uip_input.c uip_send.c -NET_CSRCS += uip_poll.c uip_callback.c +NET_CSRCS += devif_initialize.c devif_setipid.c devif_input.c devif_send.c +NET_CSRCS += devif_poll.c devif_callback.c # I/O buffer chain support required? ifeq ($(CONFIG_NET_IOB),y) -NET_CSRCS += uip_iobsend.c +NET_CSRCS += devif_iobsend.c endif # Raw packet socket support ifeq ($(CONFIG_NET_PKT),y) -NET_CSRCS += uip_pktsend.c +NET_CSRCS += devif_pktsend.c endif -# Include uip build support +# Include network device interface build support -DEPPATH += --dep-path uip -VPATH += :uip +DEPPATH += --dep-path devif +VPATH += :devif diff --git a/net/uip/uip.h b/net/devif/devif.h similarity index 93% rename from net/uip/uip.h rename to net/devif/devif.h index c0094f0d0f..c723f7023b 100644 --- a/net/uip/uip.h +++ b/net/devif/devif.h @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip.h + * net/devif/devif.h * * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef _NET_UIP_UIP_H -#define _NET_UIP_UIP_H +#ifndef _NET_DEVIF_DEVIF_H +#define _NET_DEVIF_DEVIF_H /**************************************************************************** * Included Files @@ -76,7 +76,7 @@ extern uint16_t g_ipid; /* Reassembly timer (units: deci-seconds) */ #if UIP_REASSEMBLY && !defined(CONFIG_NET_IPv6) -extern uint8_t uip_reasstmr; +extern uint8_t g_reassembly_timer; #endif /* List of applications waiting for ICMP ECHO REPLY */ @@ -97,6 +97,22 @@ extern "C" #define EXTERN extern #endif +/**************************************************************************** + * Name: devif_initialize + * + * Description: + * Perform initialization of the network device interface layer + * + * Parameters: + * None + * + * Return: + * None + * + ****************************************************************************/ + +void devif_initialize(void); + /**************************************************************************** * Function: uip_callbackinit * @@ -202,4 +218,4 @@ void uip_pktsend(FAR struct net_driver_s *dev, FAR const void *buf, #endif #endif /* CONFIG_NET */ -#endif /* _NET_UIP_UIP_H */ +#endif /* _NET_DEVIF_DEVIF_H */ diff --git a/net/uip/uip_callback.c b/net/devif/devif_callback.c similarity index 99% rename from net/uip/uip_callback.c rename to net/devif/devif_callback.c index 585ac0cef9..aad9c4f0aa 100644 --- a/net/uip/uip_callback.c +++ b/net/devif/devif_callback.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_callback.c + * net/devif/devif_callback.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Private Data diff --git a/net/uip/uip_initialize.c b/net/devif/devif_initialize.c similarity index 95% rename from net/uip/uip_initialize.c rename to net/devif/devif_initialize.c index e6863d585e..63b4ab7fcc 100644 --- a/net/uip/uip_initialize.c +++ b/net/devif/devif_initialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_initialize.c + * net/devif/devif_initialize.c * * Copyright (C) 2007-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -48,7 +48,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Pre-processor Definitions @@ -85,7 +85,7 @@ const uip_ipaddr_t g_allzeroaddr = /* Reassembly timer (units: deci-seconds) */ #if UIP_REASSEMBLY && !defined(CONFIG_NET_IPv6) -uint8_t uip_reasstmr; +uint8_t g_reassembly_timer; #endif /**************************************************************************** @@ -101,10 +101,10 @@ uint8_t uip_reasstmr; ****************************************************************************/ /**************************************************************************** - * Name: uip_initialize + * Name: devif_initialize * * Description: - * Perform initialization of the uIP layer + * Perform initialization of the network device interface layer * * Parameters: * None @@ -114,7 +114,7 @@ uint8_t uip_reasstmr; * ****************************************************************************/ -void uip_initialize(void) +void devif_initialize(void) { /* Initialize callback support */ diff --git a/net/uip/uip_input.c b/net/devif/devif_input.c similarity index 97% rename from net/uip/uip_input.c rename to net/devif/devif_input.c index bab44aaa0f..ccdd552f75 100644 --- a/net/uip/uip_input.c +++ b/net/devif/devif_input.c @@ -94,7 +94,7 @@ # include "net_neighbor.h" #endif /* CONFIG_NET_IPv6 */ -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" #include "udp/udp.h" #include "pkt/pkt.h" @@ -155,15 +155,15 @@ static uint8_t uip_reass(void) uint16_t len; uint16_t i; - /* If uip_reasstmr is zero, no packet is present in the buffer, so we - * write the IP header of the fragment into the reassembly - * buffer. The timer is updated with the maximum age. + /* If g_reassembly_timer is zero, no packet is present in the buffer, so + * we write the IP header of the fragment into the reassembly buffer. The + * timer is updated with the maximum age. */ - if (!uip_reasstmr) + if (!g_reassembly_timer) { memcpy(uip_reassbuf, &pbuf->vhl, UIP_IPH_LEN); - uip_reasstmr = UIP_REASS_MAXAGE; + g_reassembly_timer = UIP_REASS_MAXAGE; uip_reassflags = 0; /* Clear the bitmap. */ @@ -189,7 +189,7 @@ static uint8_t uip_reass(void) if (offset > UIP_REASS_BUFSIZE || offset + len > UIP_REASS_BUFSIZE) { - uip_reasstmr = 0; + g_reassembly_timer = 0; goto nullreturn; } @@ -266,7 +266,7 @@ static uint8_t uip_reass(void) * the timer. */ - uip_reasstmr = 0; + g_reassembly_timer = 0; memcpy(pbuf, pfbuf, uip_reasslen); /* Pretend to be a "normal" (i.e., not fragmented) IP packet from diff --git a/net/uip/uip_iobsend.c b/net/devif/devif_iobsend.c similarity index 99% rename from net/uip/uip_iobsend.c rename to net/devif/devif_iobsend.c index ed18cf5835..bfc947648a 100644 --- a/net/uip/uip_iobsend.c +++ b/net/devif/devif_iobsend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_iobsend.c + * net/devif/devif_iobsend.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/net/uip/uip_pktsend.c b/net/devif/devif_pktsend.c similarity index 99% rename from net/uip/uip_pktsend.c rename to net/devif/devif_pktsend.c index 1e55244815..f18be4d9a2 100644 --- a/net/uip/uip_pktsend.c +++ b/net/devif/devif_pktsend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_pktsend.c + * net/devif/devif_pktsend.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/net/uip/uip_poll.c b/net/devif/devif_poll.c similarity index 98% rename from net/uip/uip_poll.c rename to net/devif/devif_poll.c index fef5c0ace4..be1e2cb3f8 100644 --- a/net/uip/uip_poll.c +++ b/net/devif/devif_poll.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_poll.c + * net/devif/devif_poll.c * * Copyright (C) 2007-2010, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" #include "udp/udp.h" #include "pkt/pkt.h" @@ -374,9 +374,9 @@ int uip_timer(FAR struct net_driver_s *dev, uip_poll_callback_t callback, /* Increment the timer used by the IP reassembly logic */ #if UIP_REASSEMBLY - if (uip_reasstmr != 0 && uip_reasstmr < UIP_REASS_MAXAGE) + if (g_reassembly_timer != 0 && g_reassembly_timer < UIP_REASS_MAXAGE) { - uip_reasstmr += hsec; + g_reassembly_timer += hsec; } #endif /* UIP_REASSEMBLY */ diff --git a/net/uip/uip_send.c b/net/devif/devif_send.c similarity index 99% rename from net/uip/uip_send.c rename to net/devif/devif_send.c index 515ce8e9c0..a019aadfc6 100644 --- a/net/uip/uip_send.c +++ b/net/devif/devif_send.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_send.c + * net/devif/devif_send.c * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/net/uip/uip_setipid.c b/net/devif/devif_setipid.c similarity index 98% rename from net/uip/uip_setipid.c rename to net/devif/devif_setipid.c index 3c609e79fb..018ec914f1 100644 --- a/net/uip/uip_setipid.c +++ b/net/devif/devif_setipid.c @@ -1,5 +1,5 @@ /**************************************************************************** - * net/uip/uip_setipid.c + * net/devif/devif_setipid.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Private Data diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index e891ccdfdf..b38713336a 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -54,7 +54,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "icmp/icmp.h" #include "utils/utils.h" diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 1ba91d3377..de270cd827 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -55,7 +55,7 @@ #include #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "icmp/icmp.h" /**************************************************************************** diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c index af98e26f38..7cd2f760aa 100644 --- a/net/icmp/icmp_poll.c +++ b/net/icmp/icmp_poll.c @@ -47,7 +47,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c index 5f1911ad67..6ab73e7777 100644 --- a/net/icmp/icmp_send.c +++ b/net/icmp/icmp_send.c @@ -47,7 +47,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "utils/utils.h" #include "icmp/icmp.h" diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c index f0b3e53994..a4900eb8a8 100644 --- a/net/igmp/igmp_group.c +++ b/net/igmp/igmp_group.c @@ -58,7 +58,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_initialize.c b/net/igmp/igmp_initialize.c index f0ea8c4b50..f2a4979cbf 100644 --- a/net/igmp/igmp_initialize.c +++ b/net/igmp/igmp_initialize.c @@ -50,7 +50,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index 856e99adad..2d0837122a 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -52,7 +52,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c index 7e3540e079..b817d9c7e3 100644 --- a/net/igmp/igmp_join.c +++ b/net/igmp/igmp_join.c @@ -51,7 +51,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c index 65cffc1089..e05e900aaa 100644 --- a/net/igmp/igmp_leave.c +++ b/net/igmp/igmp_leave.c @@ -52,7 +52,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c index 42dbf04071..5d642c248f 100644 --- a/net/igmp/igmp_mcastmac.c +++ b/net/igmp/igmp_mcastmac.c @@ -50,7 +50,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c index 5a42cadbd9..9616fd4a0a 100644 --- a/net/igmp/igmp_msg.c +++ b/net/igmp/igmp_msg.c @@ -50,7 +50,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c index 48b4f39dc5..e1d1e08c7e 100644 --- a/net/igmp/igmp_poll.c +++ b/net/igmp/igmp_poll.c @@ -51,7 +51,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c index 8ff5ac6984..2658f5767a 100644 --- a/net/igmp/igmp_send.c +++ b/net/igmp/igmp_send.c @@ -49,7 +49,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index 5feebdd2e0..71ba9ce76e 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP diff --git a/net/net_initialize.c b/net/net_initialize.c index 185a07943d..f5431bd60e 100644 --- a/net/net_initialize.c +++ b/net/net_initialize.c @@ -47,6 +47,7 @@ #include #include "socket/socket.h" +#include "devif/devif.h" #include "netdev/netdev.h" #include "tcp/tcp.h" #include "udp/udp.h" @@ -94,7 +95,7 @@ void net_initialize(void) /* Initialize the device interface layer */ - uip_initialize(); + devif_initialize(); #ifdef CONFIG_NET_PKT /* Initialize packet socket support */ diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 30dfecaf64..9c90225ee3 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -48,7 +48,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c index 55a8a35060..be0687aece 100644 --- a/net/pkt/pkt_conn.c +++ b/net/pkt/pkt_conn.c @@ -56,7 +56,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c index aaa1e1c896..46c6b8daaf 100644 --- a/net/pkt/pkt_input.c +++ b/net/pkt/pkt_input.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index 1db880bdb3..7ab0803ca4 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/pkt/pkt_send.c b/net/pkt/pkt_send.c index 60fcb65e47..39924fd881 100644 --- a/net/pkt/pkt_send.c +++ b/net/pkt/pkt_send.c @@ -57,7 +57,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/socket/connect.c b/net/socket/connect.c index 057d795bf9..29fbd744f2 100644 --- a/net/socket/connect.c +++ b/net/socket/connect.c @@ -53,7 +53,7 @@ #include #include "socket/socket.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" #include "udp/udp.h" diff --git a/net/socket/net_close.c b/net/socket/net_close.c index 7d0eab2b70..e6738e0648 100644 --- a/net/socket/net_close.c +++ b/net/socket/net_close.c @@ -59,7 +59,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "pkt/pkt.h" /**************************************************************************** diff --git a/net/socket/net_monitor.c b/net/socket/net_monitor.c index 25bcff8cb3..dfc4acbb0b 100644 --- a/net/socket/net_monitor.c +++ b/net/socket/net_monitor.c @@ -47,7 +47,7 @@ #include #include "socket/socket.h" -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Private Types diff --git a/net/socket/net_poll.c b/net/socket/net_poll.c index bb40c0b540..dcce077f81 100644 --- a/net/socket/net_poll.c +++ b/net/socket/net_poll.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "socket/socket.h" diff --git a/net/socket/net_sendfile.c b/net/socket/net_sendfile.c index 07396a1b79..6f657ee6ab 100644 --- a/net/socket/net_sendfile.c +++ b/net/socket/net_sendfile.c @@ -63,7 +63,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Definitions diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 8a74e3b3e9..16ce70b1b7 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -62,7 +62,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" #include "udp/udp.h" #include "pkt/pkt.h" diff --git a/net/socket/sendto.c b/net/socket/sendto.c index 846050f820..4b943b298a 100644 --- a/net/socket/sendto.c +++ b/net/socket/sendto.c @@ -54,7 +54,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "udp/udp.h" /**************************************************************************** diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c index f020492089..2349c9f676 100644 --- a/net/tcp/tcp_appsend.c +++ b/net/tcp/tcp_appsend.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c index 64692b367e..a88d0bdf94 100644 --- a/net/tcp/tcp_backlog.c +++ b/net/tcp/tcp_backlog.c @@ -50,7 +50,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Private Data diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index bbd886173a..d62ee4dae8 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -51,7 +51,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index f664776ad6..dd1fea30f0 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -57,7 +57,7 @@ #include #include "tcp/tcp.h" -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Public Data diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index d85d1f4319..8d54b1b18d 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -56,7 +56,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "utils/utils.h" #include "tcp/tcp.h" diff --git a/net/tcp/tcp_listen.c b/net/tcp/tcp_listen.c index be9324103f..36af755566 100644 --- a/net/tcp/tcp_listen.c +++ b/net/tcp/tcp_listen.c @@ -51,7 +51,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/tcp/tcp_poll.c b/net/tcp/tcp_poll.c index 465a3e253e..a636613916 100644 --- a/net/tcp/tcp_poll.c +++ b/net/tcp/tcp_poll.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c index ddc6a3e46e..2656583614 100644 --- a/net/tcp/tcp_send.c +++ b/net/tcp/tcp_send.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "utils/utils.h" /**************************************************************************** diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index f9af6e0a8e..2871847490 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -71,7 +71,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" #include "tcp/tcp.h" -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Pre-processor Definitions diff --git a/net/tcp/tcp_send_unbuffered.c b/net/tcp/tcp_send_unbuffered.c index 6a3d5062fb..7338921be7 100644 --- a/net/tcp/tcp_send_unbuffered.c +++ b/net/tcp/tcp_send_unbuffered.c @@ -58,7 +58,7 @@ #include "socket/socket.h" #include "netdev/netdev.h" -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/tcp/tcp_seqno.c b/net/tcp/tcp_seqno.c index c844cd903e..2324cba3bb 100644 --- a/net/tcp/tcp_seqno.c +++ b/net/tcp/tcp_seqno.c @@ -54,7 +54,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" /**************************************************************************** * Public Data diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index 87083aef6d..441c2106d8 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -54,7 +54,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "tcp/tcp.h" /**************************************************************************** diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 4c57db7442..53137e8527 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -48,7 +48,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "udp/udp.h" /**************************************************************************** diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index 51fb7dd8a9..7b5b29fea1 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -61,7 +61,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "udp/udp.h" /**************************************************************************** diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index d2b8b13076..4627883e35 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -53,7 +53,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "utils/utils.h" #include "udp/udp.h" diff --git a/net/udp/udp_poll.c b/net/udp/udp_poll.c index 6196fca2d3..3f612c38e4 100644 --- a/net/udp/udp_poll.c +++ b/net/udp/udp_poll.c @@ -52,7 +52,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "udp/udp.h" /**************************************************************************** diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index 431f06e16e..e41f00b4c0 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -52,7 +52,7 @@ #include #include -#include "uip/uip.h" +#include "devif/devif.h" #include "utils/utils.h" #include "udp/udp.h"