NET: emoved all includes of uip.h; added includes of ip.h wherever needed. Tried to fix problems of the now missing sneak inclusions because uip.h was removed. There are probably a few of these that were missed.

This commit is contained in:
Gregory Nutt
2014-07-04 19:13:08 -06:00
parent 0bb153b8cb
commit 60246e613b
74 changed files with 175 additions and 61 deletions
+2
View File
@@ -44,6 +44,8 @@
#include <sys/types.h>
#include <nuttx/net/ip.h>
#ifdef CONFIG_NET_ICMP
/****************************************************************************
+3
View File
@@ -49,9 +49,12 @@
#include <debug.h>
#include <net/if.h>
#include <arpa/inet.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
#include <nuttx/net/ip.h>
#include "devif/devif.h"
#include "icmp/icmp.h"
+2
View File
@@ -48,10 +48,12 @@
#include <debug.h>
#include <net/if.h>
#include <nuttx/clock.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/net.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
#include <nuttx/net/icmp.h>
#include "netdev/netdev.h"
+1
View File
@@ -47,6 +47,7 @@
#include <nuttx/net/icmp.h>
#include "devif/devif.h"
#include "icmp/icmp.h"
/****************************************************************************
* Pre-processor Definitions
+5 -2
View File
@@ -42,9 +42,12 @@
#include <debug.h>
#include <arpa/inet.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
#include <nuttx/net/ip.h>
#include "devif/devif.h"
#include "utils/utils.h"
@@ -118,7 +121,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr)
picmp->flow = 0x00;
picmp->len[0] = (dev->d_sndlen >> 8);
picmp->len[1] = (dev->d_sndlen & 0xff);
picmp->nexthdr = UIP_PROTO_ICMP;
picmp->nexthdr = IP_PROTO_ICMP;
picmp->hoplimit = UIP_TTL;
net_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr);
@@ -136,7 +139,7 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr)
picmp->ipoffset[0] = UIP_TCPFLAG_DONTFRAG >> 8;
picmp->ipoffset[1] = UIP_TCPFLAG_DONTFRAG & 0xff;
picmp->ttl = UIP_TTL;
picmp->proto = UIP_PROTO_ICMP;
picmp->proto = IP_PROTO_ICMP;
net_ipaddr_hdrcopy(picmp->srcipaddr, &dev->d_ipaddr);
net_ipaddr_hdrcopy(picmp->destipaddr, destaddr);