From 24042643b3c7488b0cd66ce1ea910d1e43a72cde Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 30 Oct 2013 13:23:59 +0100 Subject: Revert superfluous changes --- freebsd/lib/libc/db/btree/bt_close.c | 2 -- freebsd/lib/libc/db/btree/bt_conv.c | 2 -- freebsd/lib/libc/db/btree/bt_debug.c | 2 -- freebsd/lib/libc/db/btree/bt_delete.c | 2 -- freebsd/lib/libc/db/btree/bt_get.c | 2 -- freebsd/lib/libc/db/btree/bt_open.c | 2 -- freebsd/lib/libc/db/btree/bt_overflow.c | 2 -- freebsd/lib/libc/db/btree/bt_page.c | 2 -- freebsd/lib/libc/db/btree/bt_put.c | 2 -- freebsd/lib/libc/db/btree/bt_search.c | 2 -- freebsd/lib/libc/db/btree/bt_seq.c | 2 -- freebsd/lib/libc/db/btree/bt_split.c | 2 -- freebsd/lib/libc/db/btree/bt_utils.c | 2 -- freebsd/lib/libc/db/db/db.c | 2 -- freebsd/lib/libc/db/mpool/mpool.c | 2 -- freebsd/lib/libc/db/recno/rec_close.c | 8 +++----- freebsd/lib/libc/db/recno/rec_delete.c | 2 -- freebsd/lib/libc/db/recno/rec_get.c | 2 -- freebsd/lib/libc/db/recno/rec_open.c | 2 -- freebsd/lib/libc/db/recno/rec_put.c | 2 -- freebsd/lib/libc/db/recno/rec_search.c | 2 -- freebsd/lib/libc/db/recno/rec_seq.c | 2 -- freebsd/lib/libc/db/recno/rec_utils.c | 2 -- freebsd/lib/libc/gen/err.c | 2 -- freebsd/lib/libc/gen/gethostname.c | 2 -- freebsd/lib/libc/nameser/ns_name.c | 2 -- freebsd/lib/libc/nameser/ns_netint.c | 2 -- freebsd/lib/libc/nameser/ns_parse.c | 2 -- freebsd/lib/libc/nameser/ns_print.c | 2 -- freebsd/lib/libc/nameser/ns_ttl.c | 2 -- freebsd/lib/libc/net/base64.c | 2 -- freebsd/lib/libc/net/ether_addr.c | 2 -- freebsd/lib/libc/net/getaddrinfo.c | 2 -- freebsd/lib/libc/net/gethostbydns.c | 2 -- freebsd/lib/libc/net/gethostbyht.c | 2 -- freebsd/lib/libc/net/gethostbynis.c | 2 -- freebsd/lib/libc/net/gethostnamadr.c | 2 -- freebsd/lib/libc/net/getifaddrs.c | 2 -- freebsd/lib/libc/net/getifmaddrs.c | 2 -- freebsd/lib/libc/net/getnameinfo.c | 2 -- freebsd/lib/libc/net/getnetbydns.c | 2 -- freebsd/lib/libc/net/getnetbyht.c | 2 -- freebsd/lib/libc/net/getnetbynis.c | 2 -- freebsd/lib/libc/net/getnetnamadr.c | 2 -- freebsd/lib/libc/net/getproto.c | 2 -- freebsd/lib/libc/net/getprotoent.c | 2 -- freebsd/lib/libc/net/getprotoname.c | 2 -- freebsd/lib/libc/net/getservent.c | 2 -- freebsd/lib/libc/net/if_indextoname.c | 2 -- freebsd/lib/libc/net/if_nameindex.c | 2 -- freebsd/lib/libc/net/linkaddr.c | 2 -- freebsd/lib/libc/net/map_v4v6.c | 2 -- freebsd/lib/libc/net/name6.c | 1 - freebsd/lib/libc/net/nsdispatch.c | 4 ---- freebsd/lib/libc/net/rcmd.c | 2 -- freebsd/lib/libc/net/recv.c | 2 -- freebsd/lib/libc/net/send.c | 2 -- freebsd/lib/libc/resolv/herror.c | 2 -- freebsd/lib/libc/resolv/res_comp.c | 2 -- freebsd/lib/libc/resolv/res_data.c | 2 -- freebsd/lib/libc/resolv/res_debug.c | 2 -- freebsd/lib/libc/resolv/res_init.c | 2 -- freebsd/lib/libc/resolv/res_mkquery.c | 2 -- freebsd/lib/libc/resolv/res_mkupdate.c | 2 -- freebsd/lib/libc/resolv/res_private.h | 2 -- freebsd/lib/libc/resolv/res_query.c | 2 -- freebsd/lib/libc/resolv/res_send.c | 2 -- freebsd/lib/libc/resolv/res_state.c | 2 -- freebsd/lib/libc/resolv/res_update.c | 2 -- freebsd/lib/libc/stdio/fgetln.c | 2 -- freebsd/lib/libc/string/strsep.c | 2 -- freebsd/lib/libipsec/ipsec_get_policylen.c | 1 + freebsd/lib/libkvm/kvm.h | 2 +- freebsd/lib/libmemstat/memstat_malloc.c | 3 --- freebsd/lib/libmemstat/memstat_uma.c | 3 --- freebsd/sys/net/if.c | 22 +++++++++++----------- freebsd/sys/net/if.h | 7 +------ freebsd/sys/net/if_epair.c | 16 ++++++++-------- freebsd/sys/net/if_gre.c | 8 ++++---- freebsd/sys/net/if_gre.h | 6 +++--- freebsd/sys/netinet/in.h | 8 ++++++-- freebsd/sys/netinet/ip_gre.c | 6 +++--- freebsd/sys/netinet6/in6.h | 2 +- 83 files changed, 42 insertions(+), 191 deletions(-) diff --git a/freebsd/lib/libc/db/btree/bt_close.c b/freebsd/lib/libc/db/btree/bt_close.c index 76220443..8ca0bb95 100644 --- a/freebsd/lib/libc/db/btree/bt_close.c +++ b/freebsd/lib/libc/db/btree/bt_close.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_conv.c b/freebsd/lib/libc/db/btree/bt_conv.c index 91cbf872..16ed3fa5 100644 --- a/freebsd/lib/libc/db/btree/bt_conv.c +++ b/freebsd/lib/libc/db/btree/bt_conv.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_debug.c b/freebsd/lib/libc/db/btree/bt_debug.c index c8c5878c..587a8824 100644 --- a/freebsd/lib/libc/db/btree/bt_debug.c +++ b/freebsd/lib/libc/db/btree/bt_debug.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_delete.c b/freebsd/lib/libc/db/btree/bt_delete.c index 258e318b..74948e87 100644 --- a/freebsd/lib/libc/db/btree/bt_delete.c +++ b/freebsd/lib/libc/db/btree/bt_delete.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_get.c b/freebsd/lib/libc/db/btree/bt_get.c index 23f629b8..a7152c35 100644 --- a/freebsd/lib/libc/db/btree/bt_get.c +++ b/freebsd/lib/libc/db/btree/bt_get.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_open.c b/freebsd/lib/libc/db/btree/bt_open.c index 1be97b49..ac0f7a42 100644 --- a/freebsd/lib/libc/db/btree/bt_open.c +++ b/freebsd/lib/libc/db/btree/bt_open.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_overflow.c b/freebsd/lib/libc/db/btree/bt_overflow.c index 8d6ebc4d..d6a61693 100644 --- a/freebsd/lib/libc/db/btree/bt_overflow.c +++ b/freebsd/lib/libc/db/btree/bt_overflow.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_page.c b/freebsd/lib/libc/db/btree/bt_page.c index c04c1ca9..3f8ecc46 100644 --- a/freebsd/lib/libc/db/btree/bt_page.c +++ b/freebsd/lib/libc/db/btree/bt_page.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_put.c b/freebsd/lib/libc/db/btree/bt_put.c index ee1d22f9..b5fd5be0 100644 --- a/freebsd/lib/libc/db/btree/bt_put.c +++ b/freebsd/lib/libc/db/btree/bt_put.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_search.c b/freebsd/lib/libc/db/btree/bt_search.c index 68245d89..62b898df 100644 --- a/freebsd/lib/libc/db/btree/bt_search.c +++ b/freebsd/lib/libc/db/btree/bt_search.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_seq.c b/freebsd/lib/libc/db/btree/bt_seq.c index 0f294a83..42807b41 100644 --- a/freebsd/lib/libc/db/btree/bt_seq.c +++ b/freebsd/lib/libc/db/btree/bt_seq.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_split.c b/freebsd/lib/libc/db/btree/bt_split.c index 1957b636..383cbc21 100644 --- a/freebsd/lib/libc/db/btree/bt_split.c +++ b/freebsd/lib/libc/db/btree/bt_split.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/btree/bt_utils.c b/freebsd/lib/libc/db/btree/bt_utils.c index bdea59ae..85b59ab2 100644 --- a/freebsd/lib/libc/db/btree/bt_utils.c +++ b/freebsd/lib/libc/db/btree/bt_utils.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/db/db.c b/freebsd/lib/libc/db/db/db.c index beecad8e..18300282 100644 --- a/freebsd/lib/libc/db/db/db.c +++ b/freebsd/lib/libc/db/db/db.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/mpool/mpool.c b/freebsd/lib/libc/db/mpool/mpool.c index 44ec0278..c31c7964 100644 --- a/freebsd/lib/libc/db/mpool/mpool.c +++ b/freebsd/lib/libc/db/mpool/mpool.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_close.c b/freebsd/lib/libc/db/recno/rec_close.c index 32136bd7..e0e72233 100644 --- a/freebsd/lib/libc/db/recno/rec_close.c +++ b/freebsd/lib/libc/db/recno/rec_close.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -77,11 +75,11 @@ __rec_close(DB *dbp) /* Committed to closing. */ status = RET_SUCCESS; - -#ifndef __rtems__ /* XXX */ +#ifndef __rtems__ if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize)) status = RET_ERROR; -#endif +#endif /* __rtems__ */ + if (!F_ISSET(t, R_INMEM)) { if (F_ISSET(t, R_CLOSEFP)) { if (fclose(t->bt_rfp)) diff --git a/freebsd/lib/libc/db/recno/rec_delete.c b/freebsd/lib/libc/db/recno/rec_delete.c index fbaf65d6..6b74dd2d 100644 --- a/freebsd/lib/libc/db/recno/rec_delete.c +++ b/freebsd/lib/libc/db/recno/rec_delete.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_get.c b/freebsd/lib/libc/db/recno/rec_get.c index 40f5bb16..f64634f2 100644 --- a/freebsd/lib/libc/db/recno/rec_get.c +++ b/freebsd/lib/libc/db/recno/rec_get.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_open.c b/freebsd/lib/libc/db/recno/rec_open.c index fbd2d9ae..a9a3ee76 100644 --- a/freebsd/lib/libc/db/recno/rec_open.c +++ b/freebsd/lib/libc/db/recno/rec_open.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_put.c b/freebsd/lib/libc/db/recno/rec_put.c index a4fef549..e0801351 100644 --- a/freebsd/lib/libc/db/recno/rec_put.c +++ b/freebsd/lib/libc/db/recno/rec_put.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_search.c b/freebsd/lib/libc/db/recno/rec_search.c index ac49ab4f..e36404bf 100644 --- a/freebsd/lib/libc/db/recno/rec_search.c +++ b/freebsd/lib/libc/db/recno/rec_search.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_seq.c b/freebsd/lib/libc/db/recno/rec_seq.c index 90f34b6c..b27715f4 100644 --- a/freebsd/lib/libc/db/recno/rec_seq.c +++ b/freebsd/lib/libc/db/recno/rec_seq.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/db/recno/rec_utils.c b/freebsd/lib/libc/db/recno/rec_utils.c index a8952da1..837cb8ae 100644 --- a/freebsd/lib/libc/db/recno/rec_utils.c +++ b/freebsd/lib/libc/db/recno/rec_utils.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/gen/err.c b/freebsd/lib/libc/gen/err.c index d2956c81..06f82542 100644 --- a/freebsd/lib/libc/gen/err.c +++ b/freebsd/lib/libc/gen/err.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/gen/gethostname.c b/freebsd/lib/libc/gen/gethostname.c index 44c7770a..df06f760 100644 --- a/freebsd/lib/libc/gen/gethostname.c +++ b/freebsd/lib/libc/gen/gethostname.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/nameser/ns_name.c b/freebsd/lib/libc/nameser/ns_name.c index 862db328..a41acd3b 100644 --- a/freebsd/lib/libc/nameser/ns_name.c +++ b/freebsd/lib/libc/nameser/ns_name.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/nameser/ns_netint.c b/freebsd/lib/libc/nameser/ns_netint.c index 7e4b0818..b08c58b4 100644 --- a/freebsd/lib/libc/nameser/ns_netint.c +++ b/freebsd/lib/libc/nameser/ns_netint.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/nameser/ns_parse.c b/freebsd/lib/libc/nameser/ns_parse.c index a3ff3cd9..e010d181 100644 --- a/freebsd/lib/libc/nameser/ns_parse.c +++ b/freebsd/lib/libc/nameser/ns_parse.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/nameser/ns_print.c b/freebsd/lib/libc/nameser/ns_print.c index 7dc73b09..aac4c756 100644 --- a/freebsd/lib/libc/nameser/ns_print.c +++ b/freebsd/lib/libc/nameser/ns_print.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/nameser/ns_ttl.c b/freebsd/lib/libc/nameser/ns_ttl.c index 821c531f..627ddf17 100644 --- a/freebsd/lib/libc/nameser/ns_ttl.c +++ b/freebsd/lib/libc/nameser/ns_ttl.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/net/base64.c b/freebsd/lib/libc/net/base64.c index 70760b65..0da3c197 100644 --- a/freebsd/lib/libc/net/base64.c +++ b/freebsd/lib/libc/net/base64.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1996, 1998 by Internet Software Consortium. * diff --git a/freebsd/lib/libc/net/ether_addr.c b/freebsd/lib/libc/net/ether_addr.c index f0f63941..81df6ec4 100644 --- a/freebsd/lib/libc/net/ether_addr.c +++ b/freebsd/lib/libc/net/ether_addr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1995 Bill Paul . * Copyright (c) 2007 Robert N. M. Watson diff --git a/freebsd/lib/libc/net/getaddrinfo.c b/freebsd/lib/libc/net/getaddrinfo.c index aab02bf6..760652d6 100644 --- a/freebsd/lib/libc/net/getaddrinfo.c +++ b/freebsd/lib/libc/net/getaddrinfo.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */ /* diff --git a/freebsd/lib/libc/net/gethostbydns.c b/freebsd/lib/libc/net/gethostbydns.c index ba59bbc3..01813c42 100644 --- a/freebsd/lib/libc/net/gethostbydns.c +++ b/freebsd/lib/libc/net/gethostbydns.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * ++Copyright++ 1985, 1988, 1993 * - diff --git a/freebsd/lib/libc/net/gethostbyht.c b/freebsd/lib/libc/net/gethostbyht.c index c9990cc4..ee1f85b4 100644 --- a/freebsd/lib/libc/net/gethostbyht.c +++ b/freebsd/lib/libc/net/gethostbyht.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1985, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/gethostbynis.c b/freebsd/lib/libc/net/gethostbynis.c index 5fa6725b..eb5341ff 100644 --- a/freebsd/lib/libc/net/gethostbynis.c +++ b/freebsd/lib/libc/net/gethostbynis.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1994, Garrett Wollman * diff --git a/freebsd/lib/libc/net/gethostnamadr.c b/freebsd/lib/libc/net/gethostnamadr.c index 412ad57d..e854454b 100644 --- a/freebsd/lib/libc/net/gethostnamadr.c +++ b/freebsd/lib/libc/net/gethostnamadr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1994, Garrett Wollman * diff --git a/freebsd/lib/libc/net/getifaddrs.c b/freebsd/lib/libc/net/getifaddrs.c index ddb8f437..4efb1cc3 100644 --- a/freebsd/lib/libc/net/getifaddrs.c +++ b/freebsd/lib/libc/net/getifaddrs.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */ /* diff --git a/freebsd/lib/libc/net/getifmaddrs.c b/freebsd/lib/libc/net/getifmaddrs.c index 23cf96e7..3bf656e2 100644 --- a/freebsd/lib/libc/net/getifmaddrs.c +++ b/freebsd/lib/libc/net/getifmaddrs.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2003 Bruce M. Simpson. * All rights reserved diff --git a/freebsd/lib/libc/net/getnameinfo.c b/freebsd/lib/libc/net/getnameinfo.c index 4b4d24a2..d8c871cf 100644 --- a/freebsd/lib/libc/net/getnameinfo.c +++ b/freebsd/lib/libc/net/getnameinfo.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */ /* diff --git a/freebsd/lib/libc/net/getnetbydns.c b/freebsd/lib/libc/net/getnetbydns.c index 8b7ccd4f..6e844951 100644 --- a/freebsd/lib/libc/net/getnetbydns.c +++ b/freebsd/lib/libc/net/getnetbydns.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1985, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/getnetbyht.c b/freebsd/lib/libc/net/getnetbyht.c index bfede4b9..eebb1170 100644 --- a/freebsd/lib/libc/net/getnetbyht.c +++ b/freebsd/lib/libc/net/getnetbyht.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/getnetbynis.c b/freebsd/lib/libc/net/getnetbynis.c index 1d256a81..e4dfb8bd 100644 --- a/freebsd/lib/libc/net/getnetbynis.c +++ b/freebsd/lib/libc/net/getnetbynis.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1994, Garrett Wollman * diff --git a/freebsd/lib/libc/net/getnetnamadr.c b/freebsd/lib/libc/net/getnetnamadr.c index c5100a32..5a30b5bf 100644 --- a/freebsd/lib/libc/net/getnetnamadr.c +++ b/freebsd/lib/libc/net/getnetnamadr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1994, Garrett Wollman * diff --git a/freebsd/lib/libc/net/getproto.c b/freebsd/lib/libc/net/getproto.c index a679db6d..b923edf1 100644 --- a/freebsd/lib/libc/net/getproto.c +++ b/freebsd/lib/libc/net/getproto.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/getprotoent.c b/freebsd/lib/libc/net/getprotoent.c index ae6584b0..ee6cdb47 100644 --- a/freebsd/lib/libc/net/getprotoent.c +++ b/freebsd/lib/libc/net/getprotoent.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/getprotoname.c b/freebsd/lib/libc/net/getprotoname.c index 4199b213..22c57594 100644 --- a/freebsd/lib/libc/net/getprotoname.c +++ b/freebsd/lib/libc/net/getprotoname.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/getservent.c b/freebsd/lib/libc/net/getservent.c index 486249d6..cac0df15 100644 --- a/freebsd/lib/libc/net/getservent.c +++ b/freebsd/lib/libc/net/getservent.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/if_indextoname.c b/freebsd/lib/libc/net/if_indextoname.c index ef201c56..26d0b753 100644 --- a/freebsd/lib/libc/net/if_indextoname.c +++ b/freebsd/lib/libc/net/if_indextoname.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */ /*- diff --git a/freebsd/lib/libc/net/if_nameindex.c b/freebsd/lib/libc/net/if_nameindex.c index 5b299300..6e5b59ad 100644 --- a/freebsd/lib/libc/net/if_nameindex.c +++ b/freebsd/lib/libc/net/if_nameindex.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */ /*- diff --git a/freebsd/lib/libc/net/linkaddr.c b/freebsd/lib/libc/net/linkaddr.c index b2170444..31c03781 100644 --- a/freebsd/lib/libc/net/linkaddr.c +++ b/freebsd/lib/libc/net/linkaddr.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/map_v4v6.c b/freebsd/lib/libc/net/map_v4v6.c index 0436c763..5a4ecf4a 100644 --- a/freebsd/lib/libc/net/map_v4v6.c +++ b/freebsd/lib/libc/net/map_v4v6.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * ++Copyright++ 1985, 1988, 1993 * - diff --git a/freebsd/lib/libc/net/name6.c b/freebsd/lib/libc/net/name6.c index a7abcb12..c60a3efd 100644 --- a/freebsd/lib/libc/net/name6.c +++ b/freebsd/lib/libc/net/name6.c @@ -1,4 +1,3 @@ -#include "port_before.h" /* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */ /* diff --git a/freebsd/lib/libc/net/nsdispatch.c b/freebsd/lib/libc/net/nsdispatch.c index 9262d3a1..9c3d5116 100644 --- a/freebsd/lib/libc/net/nsdispatch.c +++ b/freebsd/lib/libc/net/nsdispatch.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */ /*- @@ -76,9 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifndef __rtems__ #include -#endif /* __rtems__ */ #include #include #define _NS_PRIVATE diff --git a/freebsd/lib/libc/net/rcmd.c b/freebsd/lib/libc/net/rcmd.c index a5a7a0c6..d3026e16 100644 --- a/freebsd/lib/libc/net/rcmd.c +++ b/freebsd/lib/libc/net/rcmd.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1983, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/recv.c b/freebsd/lib/libc/net/recv.c index c0103711..433e1bbb 100644 --- a/freebsd/lib/libc/net/recv.c +++ b/freebsd/lib/libc/net/recv.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/net/send.c b/freebsd/lib/libc/net/send.c index 8ab06ec9..c458bff3 100644 --- a/freebsd/lib/libc/net/send.c +++ b/freebsd/lib/libc/net/send.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/herror.c b/freebsd/lib/libc/resolv/herror.c index aa50d774..1a178676 100644 --- a/freebsd/lib/libc/resolv/herror.c +++ b/freebsd/lib/libc/resolv/herror.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_comp.c b/freebsd/lib/libc/resolv/res_comp.c index ac2a0752..c58497d3 100644 --- a/freebsd/lib/libc/resolv/res_comp.c +++ b/freebsd/lib/libc/resolv/res_comp.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c index 3aa0a3d4..a1c46bed 100644 --- a/freebsd/lib/libc/resolv/res_data.c +++ b/freebsd/lib/libc/resolv/res_data.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/resolv/res_debug.c b/freebsd/lib/libc/resolv/res_debug.c index 61c89f97..e7e4d3a6 100644 --- a/freebsd/lib/libc/resolv/res_debug.c +++ b/freebsd/lib/libc/resolv/res_debug.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1985 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c index 0b7d4682..34e49ee1 100644 --- a/freebsd/lib/libc/resolv/res_init.c +++ b/freebsd/lib/libc/resolv/res_init.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1985, 1989, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_mkquery.c b/freebsd/lib/libc/resolv/res_mkquery.c index f53caa39..9e93dbbc 100644 --- a/freebsd/lib/libc/resolv/res_mkquery.c +++ b/freebsd/lib/libc/resolv/res_mkquery.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_mkupdate.c b/freebsd/lib/libc/resolv/res_mkupdate.c index 98a21010..15af24ff 100644 --- a/freebsd/lib/libc/resolv/res_mkupdate.c +++ b/freebsd/lib/libc/resolv/res_mkupdate.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-1999 by Internet Software Consortium. diff --git a/freebsd/lib/libc/resolv/res_private.h b/freebsd/lib/libc/resolv/res_private.h index 75217406..4e98157c 100644 --- a/freebsd/lib/libc/resolv/res_private.h +++ b/freebsd/lib/libc/resolv/res_private.h @@ -1,5 +1,3 @@ -#include "port_before.h" - #ifndef res_private_h #define res_private_h diff --git a/freebsd/lib/libc/resolv/res_query.c b/freebsd/lib/libc/resolv/res_query.c index f0f7a531..2aab5085 100644 --- a/freebsd/lib/libc/resolv/res_query.c +++ b/freebsd/lib/libc/resolv/res_query.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c index 7f421bba..57bf0e17 100644 --- a/freebsd/lib/libc/resolv/res_send.c +++ b/freebsd/lib/libc/resolv/res_send.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /* * Copyright (c) 1985, 1989, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/resolv/res_state.c b/freebsd/lib/libc/resolv/res_state.c index f3fc63c1..456e2705 100644 --- a/freebsd/lib/libc/resolv/res_state.c +++ b/freebsd/lib/libc/resolv/res_state.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 2006 The FreeBSD Project. All rights reserved. * diff --git a/freebsd/lib/libc/resolv/res_update.c b/freebsd/lib/libc/resolv/res_update.c index 5853831a..62c2edbe 100644 --- a/freebsd/lib/libc/resolv/res_update.c +++ b/freebsd/lib/libc/resolv/res_update.c @@ -1,5 +1,3 @@ -#include "port_before.h" - #if !defined(lint) && !defined(SABER) static const char rcsid[] = "$Id: res_update.c,v 1.12.18.1 2005/04/27 05:01:12 sra Exp $"; #endif /* not lint */ diff --git a/freebsd/lib/libc/stdio/fgetln.c b/freebsd/lib/libc/stdio/fgetln.c index 72f3b620..2b1c1125 100644 --- a/freebsd/lib/libc/stdio/fgetln.c +++ b/freebsd/lib/libc/stdio/fgetln.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libc/string/strsep.c b/freebsd/lib/libc/string/strsep.c index afdbee6d..670ab04a 100644 --- a/freebsd/lib/libc/string/strsep.c +++ b/freebsd/lib/libc/string/strsep.c @@ -1,5 +1,3 @@ -#include "port_before.h" - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/freebsd/lib/libipsec/ipsec_get_policylen.c b/freebsd/lib/libipsec/ipsec_get_policylen.c index 56f19ab6..93f167ba 100644 --- a/freebsd/lib/libipsec/ipsec_get_policylen.c +++ b/freebsd/lib/libipsec/ipsec_get_policylen.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include + #include "ipsec_strerror.h" int diff --git a/freebsd/lib/libkvm/kvm.h b/freebsd/lib/libkvm/kvm.h index d2132638..9ff0bf82 100644 --- a/freebsd/lib/libkvm/kvm.h +++ b/freebsd/lib/libkvm/kvm.h @@ -34,7 +34,7 @@ #define _KVM_H_ #include -#include +#include #include /* Default version symbol. */ diff --git a/freebsd/lib/libmemstat/memstat_malloc.c b/freebsd/lib/libmemstat/memstat_malloc.c index 6cae8f76..d813934d 100644 --- a/freebsd/lib/libmemstat/memstat_malloc.c +++ b/freebsd/lib/libmemstat/memstat_malloc.c @@ -1,4 +1,3 @@ -#include "port_before.h" /*- * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. @@ -34,9 +33,7 @@ #include #include -#ifndef __rtems__ #include -#endif #include #include #include diff --git a/freebsd/lib/libmemstat/memstat_uma.c b/freebsd/lib/libmemstat/memstat_uma.c index 6000a486..38571f1b 100644 --- a/freebsd/lib/libmemstat/memstat_uma.c +++ b/freebsd/lib/libmemstat/memstat_uma.c @@ -1,4 +1,3 @@ -#include "port_before.h" /*- * Copyright (c) 2005-2006 Robert N. M. Watson * All rights reserved. @@ -39,9 +38,7 @@ #include #include -#ifndef __rtems__ #include -#endif #include #include #include diff --git a/freebsd/sys/net/if.c b/freebsd/sys/net/if.c index e52f3963..918f8c4e 100644 --- a/freebsd/sys/net/if.c +++ b/freebsd/sys/net/if.c @@ -562,10 +562,10 @@ if_rele(struct ifnet *ifp) void ifq_init(struct ifaltq *ifq, struct ifnet *ifp) { - + mtx_init(&ifq->ifq_mtx, ifp->if_xname, "if send queue", MTX_DEF); - if (ifq->ifq_maxlen == 0) + if (ifq->ifq_maxlen == 0) ifq->ifq_maxlen = ifqmaxlen; ifq->altq_type = 0; @@ -622,7 +622,7 @@ if_attach_internal(struct ifnet *ifp, int vmove) if_addgroup(ifp, IFG_ALL); getmicrotime(&ifp->if_lastchange); - ifp->if_data.ifi_epoch = time_uptime; + ifp->if_data.ifi_epoch = time_uptime; ifp->if_data.ifi_datalen = sizeof(struct if_data); KASSERT((ifp->if_transmit == NULL && ifp->if_qflush == NULL) || @@ -632,7 +632,7 @@ if_attach_internal(struct ifnet *ifp, int vmove) ifp->if_transmit = if_transmit; ifp->if_qflush = if_qflush; } - + if (!vmove) { #ifdef MAC mac_ifnet_create(ifp); @@ -1694,7 +1694,7 @@ ifa_ifwithnet(struct sockaddr *addr, int ignore_ptp) if (ifa->ifa_addr->sa_family != af) next: continue; - if (af == AF_INET && + if (af == AF_INET && ifp->if_flags & IFF_POINTOPOINT && !ignore_ptp) { /* * This is a bit broken as it doesn't @@ -1989,7 +1989,7 @@ if_qflush(struct ifnet *ifp) { struct mbuf *m, *n; struct ifaltq *ifq; - + ifq = &ifp->if_snd; IFQ_LOCK(ifq); #ifdef ALTQ @@ -2259,7 +2259,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) * changes (renames, vmoves, if_attach, etc). */ ifp->if_flags |= IFF_RENAMING; - + /* Announce the departure of the interface. */ rt_ifannouncemsg(ifp, IFAN_DEPARTURE); EVENTHANDLER_INVOKE(ifnet_departure_event, ifp); @@ -2667,7 +2667,7 @@ if_setflag(struct ifnet *ifp, int flag, int pflag, int *refcount, int onswitch) /* Save ifnet parameters for if_ioctl() may fail */ oldcount = *refcount; oldflags = ifp->if_flags; - + /* * See if we aren't the only and touching refcount is enough. * Actually toggle interface flag if we are the first or last. @@ -3367,7 +3367,7 @@ if_start(struct ifnet *ifp) } /* - * Backwards compatibility interface for drivers + * Backwards compatibility interface for drivers * that have not implemented it */ static int @@ -3408,7 +3408,7 @@ void if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f) { - + KASSERT(if_com_alloc[type] == NULL, ("if_register_com_alloc: %d already registered", type)); KASSERT(if_com_free[type] == NULL, @@ -3421,7 +3421,7 @@ if_register_com_alloc(u_char type, void if_deregister_com_alloc(u_char type) { - + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, diff --git a/freebsd/sys/net/if.h b/freebsd/sys/net/if.h index 865513bb..1a6423f6 100644 --- a/freebsd/sys/net/if.h +++ b/freebsd/sys/net/if.h @@ -40,18 +40,13 @@ #endif #if __BSD_VISIBLE - -#ifdef __rtems__ -#include -#else -#ifndef _KERNEL /* * does not depend on on most other systems. This * helps userland compatibility. (struct timeval ifi_lastchange) */ +#ifndef _KERNEL #include #endif -#endif /* __rtems__ */ struct ifnet; #endif diff --git a/freebsd/sys/net/if_epair.c b/freebsd/sys/net/if_epair.c index e49ac84e..cd7a6c79 100644 --- a/freebsd/sys/net/if_epair.c +++ b/freebsd/sys/net/if_epair.c @@ -210,7 +210,7 @@ epair_dpcpu_init(void) s = &epair_dpcpu->epair_ifp_drain_list; s->stqh_first = NULL; s->stqh_last = &s->stqh_first; - } + } } static void @@ -486,7 +486,7 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf *m) if (m == NULL) return (0); - + /* * We are not going to use the interface en/dequeue mechanism * on the TX side. We are called from ether_output_frame() @@ -531,7 +531,7 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf *m) ifp->if_obytes += len; if (mflags & (M_BCAST|M_MCAST)) ifp->if_omcasts++; - + if ((ifp->if_drv_flags & IFF_DRV_OACTIVE) == 0) epair_start_locked(ifp); else @@ -606,7 +606,7 @@ static void epair_qflush(struct ifnet *ifp) { struct epair_softc *sc; - + sc = ifp->if_softc; KASSERT(sc != NULL, ("%s: ifp=%p, epair_softc gone? sc=%p\n", __func__, ifp, sc)); @@ -769,7 +769,7 @@ epair_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) ifc_free_unit(ifc, unit); return (ENOSPC); } - + /* * Cross-reference the interfaces so we will be able to free both. */ @@ -786,7 +786,7 @@ epair_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) netisr_get_cpuid(sca->ifp->if_index % netisr_get_cpucount()); scb->cpuid = netisr_get_cpuid(scb->ifp->if_index % netisr_get_cpucount()); - + /* Finish initialization of interface a. */ ifp = sca->ifp; ifp->if_softc = sca; @@ -865,7 +865,7 @@ epair_clone_destroy(struct if_clone *ifc, struct ifnet *ifp) */ if (ifp->if_softc == NULL) return (0); - + unit = ifp->if_dunit; sca = ifp->if_softc; oifp = sca->oifp; @@ -926,7 +926,7 @@ epair_modevent(module_t mod, int type, void *data) #ifndef __rtems__ if (TUNABLE_INT_FETCH("net.link.epair.netisr_maxqlen", &qlimit)) epair_nh.nh_qlimit = qlimit; -#endif +#endif /* __rtems__ */ netisr_register(&epair_nh); if_clone_attach(&epair_cloner); if (bootverbose) diff --git a/freebsd/sys/net/if_gre.c b/freebsd/sys/net/if_gre.c index 09950859..a75e52a4 100644 --- a/freebsd/sys/net/if_gre.c +++ b/freebsd/sys/net/if_gre.c @@ -312,7 +312,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, error = EINVAL; /* is there better errno? */ goto end; } - memset(&mob_h, 0, MOB_HH_SIZ_L); + memset(&mob_h, 0, MOB_H_SIZ_L); mob_h.proto = (ip->ip_p) << 8; mob_h.odst = ip->ip_dst.s_addr; ip->ip_dst.s_addr = sc->g_dst.s_addr; @@ -323,12 +323,12 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, * Else we also need to save and change the source */ if (in_hosteq(ip->ip_src, sc->g_src)) { - msiz = MOB_HH_SIZ_S; + msiz = MOB_H_SIZ_S; } else { - mob_h.proto |= MOB_HH_SBIT; + mob_h.proto |= MOB_H_SBIT; mob_h.osrc = ip->ip_src.s_addr; ip->ip_src.s_addr = sc->g_src.s_addr; - msiz = MOB_HH_SIZ_L; + msiz = MOB_H_SIZ_L; } mob_h.proto = htons(mob_h.proto); mob_h.hcrc = gre_in_cksum((u_int16_t *)&mob_h, msiz); diff --git a/freebsd/sys/net/if_gre.h b/freebsd/sys/net/if_gre.h index 7ac11fce..186d4cc6 100644 --- a/freebsd/sys/net/if_gre.h +++ b/freebsd/sys/net/if_gre.h @@ -162,9 +162,9 @@ struct mobip_h { } __packed; -#define MOB_HH_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t)) -#define MOB_HH_SIZ_L (sizeof(struct mobile_h)) -#define MOB_HH_SBIT 0x0080 +#define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t)) +#define MOB_H_SIZ_L (sizeof(struct mobile_h)) +#define MOB_H_SBIT 0x0080 #define GRE_TTL 30 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 #include +#ifndef __rtems__ +#include +#else /* __rtems__ */ #include +#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 -#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); diff --git a/freebsd/sys/netinet6/in6.h b/freebsd/sys/netinet6/in6.h index d0331f43..eadfc090 100644 --- a/freebsd/sys/netinet6/in6.h +++ b/freebsd/sys/netinet6/in6.h @@ -61,7 +61,7 @@ * $FreeBSD$ */ -#ifndef __KAME_NETINET_IN_HH_INCLUDED_ +#ifndef __KAME_NETINET_IN_H_INCLUDED_ #error "do not include netinet6/in6.h directly, include netinet/in.h. see RFC2553" #endif -- cgit v1.2.3