diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-30 13:23:59 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-31 13:18:54 +0100 |
| commit | 24042643b3c7488b0cd66ce1ea910d1e43a72cde (patch) | |
| tree | 22caac22aa5d40665419b0ca851b760ea6f739e1 /freebsd/sys/netinet | |
| parent | PING(8): Fix initialization and cleanup (diff) | |
| download | rtems-libbsd-24042643b3c7488b0cd66ce1ea910d1e43a72cde.tar.bz2 | |
Revert superfluous changes
Diffstat (limited to 'freebsd/sys/netinet')
| -rw-r--r-- | freebsd/sys/netinet/in.h | 8 | ||||
| -rw-r--r-- | freebsd/sys/netinet/ip_gre.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/freebsd/sys/netinet/in.h b/freebsd/sys/netinet/in.h index f38aaee2..c0bc26ec 100644 --- a/freebsd/sys/netinet/in.h +++ b/freebsd/sys/netinet/in.h @@ -35,7 +35,11 @@ #include <sys/cdefs.h> #include <rtems/bsd/sys/_types.h> +#ifndef __rtems__ +#include <machine/endian.h> +#else /* __rtems__ */ #include <machine/rtems-bsd-endian.h> +#endif /* __rtems__ */ /* Protocols common to RFC 1700, POSIX, and X/Open. */ #define IPPROTO_IP 0 /* dummy for IP */ @@ -786,9 +790,9 @@ void in_ifdetach(struct ifnet *); /* INET6 stuff */ #if __POSIX_VISIBLE >= 200112 -#define __KAME_NETINET_IN_HH_INCLUDED_ +#define __KAME_NETINET_IN_H_INCLUDED_ #include <netinet6/in6.h> -#undef __KAME_NETINET_IN_HH_INCLUDED_ +#undef __KAME_NETINET_IN_H_INCLUDED_ #endif #endif /* !_NETINET_IN_H_*/ diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c index cd118a53..1838fbd1 100644 --- a/freebsd/sys/netinet/ip_gre.c +++ b/freebsd/sys/netinet/ip_gre.c @@ -254,11 +254,11 @@ gre_mobile_input(struct mbuf *m, int hlen) GRE2IFP(sc)->if_ipackets++; GRE2IFP(sc)->if_ibytes += m->m_pkthdr.len; - if (ntohs(mip->mh.proto) & MOB_HH_SBIT) { - msiz = MOB_HH_SIZ_L; + if (ntohs(mip->mh.proto) & MOB_H_SBIT) { + msiz = MOB_H_SIZ_L; mip->mi.ip_src.s_addr = mip->mh.osrc; } else - msiz = MOB_HH_SIZ_S; + msiz = MOB_H_SIZ_S; if (m->m_len < (ip->ip_hl << 2) + msiz) { m = m_pullup(m, (ip->ip_hl << 2) + msiz); |