diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-17 17:16:46 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-17 17:16:46 -0600 |
| commit | f9e2bc993048ea1d83138b3bd01cbb8c9d8a32fd (patch) | |
| tree | 450f07ffcecc153d3901a5ef85af3ba4beb545dc /nuttx/net | |
| parent | 0ca9db7b7aa623f0802e5b51c59dfc9f6762c95a (diff) | |
| download | nuttx-f9e2bc993048ea1d83138b3bd01cbb8c9d8a32fd.tar.gz nuttx-f9e2bc993048ea1d83138b3bd01cbb8c9d8a32fd.tar.bz2 nuttx-f9e2bc993048ea1d83138b3bd01cbb8c9d8a32fd.zip | |
Move IP header flags from tcp.h to ip.h and rename IP_FLAGS vs TCPFLAGS. The problem fixed here is that there IP flags were not available when TCP was disabled. The IP flags are used in ICMP and IGFMP
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/devif/devif_input.c | 2 | ||||
| -rw-r--r-- | nuttx/net/icmp/icmp_send.c | 4 | ||||
| -rw-r--r-- | nuttx/net/igmp/igmp_send.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c index bba58be93..7a5142add 100644 --- a/nuttx/net/devif/devif_input.c +++ b/nuttx/net/devif/devif_input.c @@ -112,7 +112,7 @@ /* IP fragment re-assembly */ -#define IP_MF 0x20 +#define IP_MF 0x20 /* See IP_FLAG_MOREFRAGS */ #define TCP_REASS_BUFSIZE (NET_DEV_MTU(dev) - NET_LL_HDRLEN(dev)) #define TCP_REASS_LASTFRAG 0x01 diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c index be6621839..243b05d60 100644 --- a/nuttx/net/icmp/icmp_send.c +++ b/nuttx/net/icmp/icmp_send.c @@ -136,8 +136,8 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr) ++g_ipid; picmp->ipid[0] = g_ipid >> 8; picmp->ipid[1] = g_ipid & 0xff; - picmp->ipoffset[0] = TCPFLAG_DONTFRAG >> 8; - picmp->ipoffset[1] = TCPFLAG_DONTFRAG & 0xff; + picmp->ipoffset[0] = IP_FLAG_DONTFRAG >> 8; + picmp->ipoffset[1] = IP_FLAG_DONTFRAG & 0xff; picmp->ttl = IP_TTL; picmp->proto = IP_PROTO_ICMP; diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index cc5430f90..189f9cfc3 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -150,8 +150,8 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, ++g_ipid; IGMPBUF->ipid[0] = g_ipid >> 8; IGMPBUF->ipid[1] = g_ipid & 0xff; - IGMPBUF->ipoffset[0] = TCPFLAG_DONTFRAG >> 8; - IGMPBUF->ipoffset[1] = TCPFLAG_DONTFRAG & 0xff; + IGMPBUF->ipoffset[0] = IP_FLAG_DONTFRAG >> 8; + IGMPBUF->ipoffset[1] = IP_FLAG_DONTFRAG & 0xff; IGMPBUF->ttl = IGMP_TTL; IGMPBUF->proto = IP_PROTO_IGMP; |