diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-04 19:13:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-04 19:13:08 -0600 |
| commit | 3285efc508064d44b60120ffe903c13184482869 (patch) | |
| tree | 3844c1fb247d2e5d8de17b4f390b78ed19e26c65 /nuttx/net/tcp | |
| parent | 9359459245f11e94dee418e424e44f598bc04039 (diff) | |
| download | px4-nuttx-3285efc508064d44b60120ffe903c13184482869.tar.gz px4-nuttx-3285efc508064d44b60120ffe903c13184482869.tar.bz2 px4-nuttx-3285efc508064d44b60120ffe903c13184482869.zip | |
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.
Diffstat (limited to 'nuttx/net/tcp')
| -rw-r--r-- | nuttx/net/tcp/tcp_conn.c | 1 | ||||
| -rw-r--r-- | nuttx/net/tcp/tcp_input.c | 3 | ||||
| -rw-r--r-- | nuttx/net/tcp/tcp_send.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c index 2d87f8d4f..f1bc36557 100644 --- a/nuttx/net/tcp/tcp_conn.c +++ b/nuttx/net/tcp/tcp_conn.c @@ -54,6 +54,7 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/net.h> #include <nuttx/net/netdev.h> +#include <nuttx/net/ip.h> #include <nuttx/net/tcp.h> #include "devif/devif.h" diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c index 09b0c3111..7182275d1 100644 --- a/nuttx/net/tcp/tcp_input.c +++ b/nuttx/net/tcp/tcp_input.c @@ -52,8 +52,9 @@ #include <nuttx/net/netconfig.h> #include <nuttx/net/netdev.h> -#include <nuttx/net/tcp.h> #include <nuttx/net/netstats.h> +#include <nuttx/net/ip.h> +#include <nuttx/net/tcp.h> #include "devif/devif.h" #include "utils/utils.h" diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c index 80a8cd965..ae8c31bec 100644 --- a/nuttx/net/tcp/tcp_send.c +++ b/nuttx/net/tcp/tcp_send.c @@ -51,6 +51,7 @@ #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" @@ -180,7 +181,7 @@ static void tcp_sendcommon(FAR struct net_driver_s *dev, memcpy(pbuf->ackno, conn->rcvseq, 4); memcpy(pbuf->seqno, conn->sndseq, 4); - pbuf->proto = UIP_PROTO_TCP; + pbuf->proto = IP_PROTO_TCP; pbuf->srcport = conn->lport; pbuf->destport = conn->rport; |