diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 60dee4a8e0..cea75f4abe 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 5af9e7452d..de34dc2d72 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c index 6da88bb2cf..0051184e10 100644 --- a/fs/nfs/nfs_vfsops.c +++ b/fs/nfs/nfs_vfsops.c @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/nuttx/net/arp.h b/include/nuttx/net/arp.h index e0fea967dc..c64471ce5a 100644 --- a/include/nuttx/net/arp.h +++ b/include/nuttx/net/arp.h @@ -51,7 +51,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uipopt.h b/include/nuttx/net/netconfig.h similarity index 92% rename from include/nuttx/net/uip/uipopt.h rename to include/nuttx/net/netconfig.h index fb85b4ad76..ab2135ee4c 100644 --- a/include/nuttx/net/uip/uipopt.h +++ b/include/nuttx/net/netconfig.h @@ -1,20 +1,13 @@ /**************************************************************************** - * include/nuttx/net/uip/uipopt.h - * Configuration options for uIP. + * include/nuttx/net/netconfig.h + * Configuration options for NuttX uIP-based networking. * * This file is used for tweaking various configuration options for - * uIP. You should make a copy of this file into one of your project's - * directories instead of editing this example "uipopt.h" file that - * comes with the uIP distribution. + * uIP. This is most assuring the correct default values are provided and + * that configured options are valid. * - * uIP is configured using the per-project configuration file - * uipopt.h. This file contains all compile-time options for uIP and - * should be tweaked to match each specific project. The uIP - * distribution contains a documented example "uipopt.h" that can be - * copied and modified for each project. - * - * Note: Most of the configuration options in the uipopt.h should not - * be changed, but rather the per-project defconfig file. + * Note: Network configuration options the netconfig.h should not be changed, + * but rather the per-project defconfig file. * * Copyright (C) 2007, 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -51,8 +44,8 @@ * ****************************************************************************/ -#ifndef __INCLUDE_NUTTX_NET_UIP_UIPOPT_H -#define __INCLUDE_NUTTX_NET_UIP_UIPOPT_H +#ifndef __INCLUDE_NUTTX_NET_NETCONFG_H +#define __INCLUDE_NUTTX_NET_NETCONFG_H /**************************************************************************** * Included Files @@ -329,4 +322,4 @@ typedef uint16_t uip_stats_t; -#endif /* __INCLUDE_NUTTX_NET_UIP_UIPOPT_H */ +#endif /* __INCLUDE_NUTTX_NET_NETCONFG_H */ diff --git a/include/nuttx/net/uip/uip-arch.h b/include/nuttx/net/uip/uip-arch.h index 905af0c507..546fe44511 100644 --- a/include/nuttx/net/uip/uip-arch.h +++ b/include/nuttx/net/uip/uip-arch.h @@ -57,7 +57,7 @@ # include #endif -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uip-icmp.h b/include/nuttx/net/uip/uip-icmp.h index 27098d5d36..849d62af00 100644 --- a/include/nuttx/net/uip/uip-icmp.h +++ b/include/nuttx/net/uip/uip-icmp.h @@ -48,7 +48,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/include/nuttx/net/uip/uip-pkt.h b/include/nuttx/net/uip/uip-pkt.h index 2580b5be60..1a5f2db4ab 100644 --- a/include/nuttx/net/uip/uip-pkt.h +++ b/include/nuttx/net/uip/uip-pkt.h @@ -47,7 +47,7 @@ #include #include -#include +#include /**************************************************************************** * Public Type Definitions diff --git a/include/nuttx/net/uip/uip-tcp.h b/include/nuttx/net/uip/uip-tcp.h index b1e0fac2ff..a019f70b0d 100644 --- a/include/nuttx/net/uip/uip-tcp.h +++ b/include/nuttx/net/uip/uip-tcp.h @@ -55,7 +55,7 @@ #include #include -#include +#include #include /**************************************************************************** diff --git a/include/nuttx/net/uip/uip-udp.h b/include/nuttx/net/uip/uip-udp.h index 5eb7f17116..9cdfb3fe70 100644 --- a/include/nuttx/net/uip/uip-udp.h +++ b/include/nuttx/net/uip/uip-udp.h @@ -52,7 +52,7 @@ #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/include/nuttx/net/uip/uip.h b/include/nuttx/net/uip/uip.h index 65f05a5ec0..2600827958 100644 --- a/include/nuttx/net/uip/uip.h +++ b/include/nuttx/net/uip/uip.h @@ -60,7 +60,7 @@ #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/net/arp/arp_inout.c b/net/arp/arp_inout.c index 18a1483cad..14963436ab 100644 --- a/net/arp/arp_inout.c +++ b/net/arp/arp_inout.c @@ -63,7 +63,7 @@ #include #include -#include +#include #include #include diff --git a/net/arp/arp_table.c b/net/arp/arp_table.c index b4d7ac6844..ebf11e2520 100644 --- a/net/arp/arp_table.c +++ b/net/arp/arp_table.c @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/net/arp/arp_timer.c b/net/arp/arp_timer.c index d6f105ac18..6331bda19b 100644 --- a/net/arp/arp_timer.c +++ b/net/arp/arp_timer.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include "net_internal.h" diff --git a/net/icmp/icmp_input.c b/net/icmp/icmp_input.c index 1e2626f3bf..8434e4ab19 100644 --- a/net/icmp/icmp_input.c +++ b/net/icmp/icmp_input.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/net/icmp/icmp_ping.c b/net/icmp/icmp_ping.c index 32c859ca0e..66f23cf79d 100644 --- a/net/icmp/icmp_ping.c +++ b/net/icmp/icmp_ping.c @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include diff --git a/net/icmp/icmp_poll.c b/net/icmp/icmp_poll.c index 747b8ae053..045facfb5a 100644 --- a/net/icmp/icmp_poll.c +++ b/net/icmp/icmp_poll.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/net/icmp/icmp_send.c b/net/icmp/icmp_send.c index b46701ed48..8d6232d368 100644 --- a/net/icmp/icmp_send.c +++ b/net/icmp/icmp_send.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index 1c6f9cc919..660d9f0b06 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_join.c b/net/igmp/igmp_join.c index e795d1dd6c..33e5b51404 100644 --- a/net/igmp/igmp_join.c +++ b/net/igmp/igmp_join.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c index f3632e338c..1b80272ee9 100644 --- a/net/igmp/igmp_leave.c +++ b/net/igmp/igmp_leave.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_mcastmac.c b/net/igmp/igmp_mcastmac.c index 3f8b8369fd..937810935f 100644 --- a/net/igmp/igmp_mcastmac.c +++ b/net/igmp/igmp_mcastmac.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include "uip/uip_internal.h" diff --git a/net/igmp/igmp_msg.c b/net/igmp/igmp_msg.c index b3d1948bfd..ae0155e700 100644 --- a/net/igmp/igmp_msg.c +++ b/net/igmp/igmp_msg.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_poll.c b/net/igmp/igmp_poll.c index 219ffe2177..55b94deb50 100644 --- a/net/igmp/igmp_poll.c +++ b/net/igmp/igmp_poll.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/net/igmp/igmp_send.c b/net/igmp/igmp_send.c index 32dc1d78f4..dbcce795b4 100644 --- a/net/igmp/igmp_send.c +++ b/net/igmp/igmp_send.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index 74ee41e5b9..bf70079984 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/pkt/pkt_callback.c b/net/pkt/pkt_callback.c index 1110a5a02d..5bc84fdb25 100644 --- a/net/pkt/pkt_callback.c +++ b/net/pkt/pkt_callback.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c index 1b262195d2..e52be6d48f 100644 --- a/net/pkt/pkt_conn.c +++ b/net/pkt/pkt_conn.c @@ -50,7 +50,7 @@ #include -#include +#include #include #include #include diff --git a/net/pkt/pkt_poll.c b/net/pkt/pkt_poll.c index 8e8d718471..ab34a3b9ae 100644 --- a/net/pkt/pkt_poll.c +++ b/net/pkt/pkt_poll.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include #include diff --git a/net/tcp/tcp_appsend.c b/net/tcp/tcp_appsend.c index 857ca4385d..79b27efe0b 100644 --- a/net/tcp/tcp_appsend.c +++ b/net/tcp/tcp_appsend.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c index a1a16323e0..8fa7072234 100644 --- a/net/tcp/tcp_backlog.c +++ b/net/tcp/tcp_backlog.c @@ -37,7 +37,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCPBACKLOG) #include diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 6a14226287..8a15e86e20 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index bae10a7549..87b8881c27 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -51,7 +51,7 @@ #include -#include +#include #include #include diff --git a/net/tcp/tcp_input.c b/net/tcp/tcp_input.c index bbd44ee6ff..76d688eda6 100644 --- a/net/tcp/tcp_input.c +++ b/net/tcp/tcp_input.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_listen.c b/net/tcp/tcp_listen.c index 4a59780916..f974d3f6fb 100644 --- a/net/tcp/tcp_listen.c +++ b/net/tcp/tcp_listen.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "uip/uip_internal.h" diff --git a/net/tcp/tcp_poll.c b/net/tcp/tcp_poll.c index ac4cdb8f3d..39955b7f12 100644 --- a/net/tcp/tcp_poll.c +++ b/net/tcp/tcp_poll.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_readahead.c b/net/tcp/tcp_readahead.c index 5ac4a42ac9..280b5469c5 100644 --- a/net/tcp/tcp_readahead.c +++ b/net/tcp/tcp_readahead.c @@ -37,7 +37,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_READAHEAD) #include diff --git a/net/tcp/tcp_send.c b/net/tcp/tcp_send.c index 3e313f2147..4d98e269ce 100644 --- a/net/tcp/tcp_send.c +++ b/net/tcp/tcp_send.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_seqno.c b/net/tcp/tcp_seqno.c index 625eefeb25..5242fe9a0b 100644 --- a/net/tcp/tcp_seqno.c +++ b/net/tcp/tcp_seqno.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_timer.c b/net/tcp/tcp_timer.c index edcdb9c242..06be1902f1 100644 --- a/net/tcp/tcp_timer.c +++ b/net/tcp/tcp_timer.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c index 929b2f3a27..0cdd99c97d 100644 --- a/net/tcp/tcp_wrbuffer.c +++ b/net/tcp/tcp_wrbuffer.c @@ -38,7 +38,7 @@ * Included Files ****************************************************************************/ -#include +#include #if defined(CONFIG_NET) && defined(CONFIG_NET_TCP) && defined(CONFIG_NET_TCP_WRITE_BUFFERS) #if defined(CONFIG_DEBUG) && defined(CONFIG_NET_TCP_WRBUFFER_DEBUG) diff --git a/net/udp/udp_callback.c b/net/udp/udp_callback.c index 9cdc8633df..cec22630ca 100644 --- a/net/udp/udp_callback.c +++ b/net/udp/udp_callback.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/udp/udp_conn.c b/net/udp/udp_conn.c index 0d36d7d678..f1c0195c28 100644 --- a/net/udp/udp_conn.c +++ b/net/udp/udp_conn.c @@ -56,7 +56,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_input.c b/net/udp/udp_input.c index e2d7c434f3..f9e7107953 100644 --- a/net/udp/udp_input.c +++ b/net/udp/udp_input.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_poll.c b/net/udp/udp_poll.c index 23b6632503..b565e50e8d 100644 --- a/net/udp/udp_poll.c +++ b/net/udp/udp_poll.c @@ -47,7 +47,7 @@ #include -#include +#include #include #include diff --git a/net/udp/udp_send.c b/net/udp/udp_send.c index aab52f6d4d..4296d69e95 100644 --- a/net/udp/udp_send.c +++ b/net/udp/udp_send.c @@ -46,7 +46,7 @@ #include -#include +#include #include #include diff --git a/net/uip/uip_callback.c b/net/uip/uip_callback.c index 4ed830e956..3c8bb19f86 100644 --- a/net/uip/uip_callback.c +++ b/net/uip/uip_callback.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_chksum.c b/net/uip/uip_chksum.c index 9f4a89866e..8670f2e1e4 100644 --- a/net/uip/uip_chksum.c +++ b/net/uip/uip_chksum.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_input.c b/net/uip/uip_input.c index fa0496ad9b..0bff32387b 100644 --- a/net/uip/uip_input.c +++ b/net/uip/uip_input.c @@ -85,7 +85,7 @@ #include #include -#include +#include #include #include diff --git a/net/uip/uip_poll.c b/net/uip/uip_poll.c index 644c1e98c8..25185e4f95 100644 --- a/net/uip/uip_poll.c +++ b/net/uip/uip_poll.c @@ -42,7 +42,7 @@ #include -#include +#include #include #include