rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-06-06 17:29:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert superfluous changes

Browse Source
This commit is contained in:
Sebastian Huber 2013-10-30 13:23:59 +01:00
parent e48f546574
commit 24042643b3
83 changed files with 42 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freebsd/lib/libc/db/btree/bt_close.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_conv.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_debug.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_delete.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_get.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_open.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_overflow.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_page.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_put.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_search.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_seq.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_split.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/btree/bt_utils.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/db/db.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/mpool/mpool.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

8
freebsd/lib/libc/db/recno/rec_close.c
View File

@ -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))

2
freebsd/lib/libc/db/recno/rec_delete.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_get.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_open.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_put.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_search.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_seq.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/db/recno/rec_utils.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/gen/err.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/gen/gethostname.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/nameser/ns_name.c
View File

@ -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.

2
freebsd/lib/libc/nameser/ns_netint.c
View File

@ -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.

2
freebsd/lib/libc/nameser/ns_parse.c
View File

@ -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.

2
freebsd/lib/libc/nameser/ns_print.c
View File

@ -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.

2
freebsd/lib/libc/nameser/ns_ttl.c
View File

@ -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.

2
freebsd/lib/libc/net/base64.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1996, 1998 by Internet Software Consortium.
*

2
freebsd/lib/libc/net/ether_addr.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
* Copyright (c) 2007 Robert N. M. Watson

2
freebsd/lib/libc/net/getaddrinfo.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $ */
/*

2
freebsd/lib/libc/net/gethostbydns.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* ++Copyright++ 1985, 1988, 1993
* -

2
freebsd/lib/libc/net/gethostbyht.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/gethostbynis.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1994, Garrett Wollman
*

2
freebsd/lib/libc/net/gethostnamadr.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1994, Garrett Wollman
*

2
freebsd/lib/libc/net/getifaddrs.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */
/*

2
freebsd/lib/libc/net/getifmaddrs.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 2003 Bruce M. Simpson.
* All rights reserved

2
freebsd/lib/libc/net/getnameinfo.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $ */
/*

2
freebsd/lib/libc/net/getnetbydns.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1985, 1988, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/getnetbyht.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/getnetbynis.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1994, Garrett Wollman
*

2
freebsd/lib/libc/net/getnetnamadr.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1994, Garrett Wollman
*

2
freebsd/lib/libc/net/getproto.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/getprotoent.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/getprotoname.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/getservent.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/if_indextoname.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $ */
/*-

2
freebsd/lib/libc/net/if_nameindex.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/* $KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $ */
/*-

2
freebsd/lib/libc/net/linkaddr.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/map_v4v6.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* ++Copyright++ 1985, 1988, 1993
* -

1
freebsd/lib/libc/net/name6.c
View File

@ -1,4 +1,3 @@
#include "port_before.h"
/* $KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $ */
/*

4
freebsd/lib/libc/net/nsdispatch.c
View File

@ -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 <rtems/bsd/sys/param.h>
#include <sys/stat.h>
#ifndef __rtems__
#include <dlfcn.h>
#endif /* __rtems__ */
#include <errno.h>
#include <fcntl.h>
#define _NS_PRIVATE

2
freebsd/lib/libc/net/rcmd.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1983, 1993, 1994
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/recv.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/net/send.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/herror.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1987, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_comp.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_data.c
View File

@ -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.

2
freebsd/lib/libc/resolv/res_debug.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1985
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_init.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_mkquery.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_mkupdate.c
View File

@ -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.

2
freebsd/lib/libc/resolv/res_private.h
View File

@ -1,5 +1,3 @@
#include "port_before.h"
#ifndef res_private_h
#define res_private_h

2
freebsd/lib/libc/resolv/res_query.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_send.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*
* Copyright (c) 1985, 1989, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/resolv/res_state.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 2006 The FreeBSD Project. All rights reserved.
*

2
freebsd/lib/libc/resolv/res_update.c
View File

@ -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 */

2
freebsd/lib/libc/stdio/fgetln.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.

2
freebsd/lib/libc/string/strsep.c
View File

@ -1,5 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.

1
freebsd/lib/libipsec/ipsec_get_policylen.c
View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <netipsec/ipsec.h>
#include <net/pfkeyv2.h>
#include "ipsec_strerror.h"
int

2
freebsd/lib/libkvm/kvm.h
View File

@ -34,7 +34,7 @@
#define _KVM_H_
#include <sys/cdefs.h>
#include <rtems/bsd/sys/types.h>
#include <rtems/bsd/sys/_types.h>
#include <nlist.h>
/* Default version symbol. */

3
freebsd/lib/libmemstat/memstat_malloc.c
View File

@ -1,4 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 2005 Robert N. M. Watson
* All rights reserved.
@ -34,9 +33,7 @@
#include <err.h>
#include <errno.h>
#ifndef __rtems__
#include <kvm.h>
#endif
#include <nlist.h>
#include <stdio.h>
#include <stdlib.h>

3
freebsd/lib/libmemstat/memstat_uma.c
View File

@ -1,4 +1,3 @@
#include "port_before.h"
/*-
* Copyright (c) 2005-2006 Robert N. M. Watson
* All rights reserved.
@ -39,9 +38,7 @@
#include <err.h>
#include <errno.h>
#ifndef __rtems__
#include <kvm.h>
#endif
#include <nlist.h>
#include <stddef.h>
#include <stdio.h>

22
freebsd/sys/net/if.c
View File

@ -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,

7
freebsd/sys/net/if.h
View File

@ -40,18 +40,13 @@
#endif
#if __BSD_VISIBLE
#ifdef __rtems__
#include <rtems/bsd/sys/time.h>
#else
#ifndef _KERNEL
/*
* <net/if.h> does not depend on <sys/time.h> on most other systems. This
* helps userland compatibility. (struct timeval ifi_lastchange)
*/
#ifndef _KERNEL
#include <rtems/bsd/sys/time.h>
#endif
#endif /* __rtems__ */
struct ifnet;
#endif

16
freebsd/sys/net/if_epair.c
View File

@ -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 <n>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)

8
freebsd/sys/net/if_gre.c
View File

@ -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);

6
freebsd/sys/net/if_gre.h
View File

@ -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

8
freebsd/sys/netinet/in.h
View File

@ -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_*/

6
freebsd/sys/netinet/ip_gre.c
View File

@ -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);

2
freebsd/sys/netinet6/in6.h
View File

@ -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