Tue Mar 6 23:31:29 2018 UTC ()

Better to add these required headers closer to where they're needed


(pgoyette)

diff -r1.1.2.1 -r1.1.2.2 src/sys/compat/common/if_40.h
diff -r1.258.2.3 -r1.258.2.4 src/sys/net/if.h

--- src/sys/compat/common/Attic/if_40.h 2018/03/06 23:17:42	1.1.2.1
+++ src/sys/compat/common/Attic/if_40.h 2018/03/06 23:31:29	1.1.2.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_40.h,v 1.1.2.1 2018/03/06 23:17:42 pgoyette Exp $	*/
+/*	$NetBSD: if_40.h,v 1.1.2.2 2018/03/06 23:31:29 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,22 +23,26 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_COMPAT_IF_40_H_
 #define	_COMPAT_IF_40_H_
 #if defined(COMPAT_40)
 #include <net/if.h>
 #include <compat/sys/sockio.h>
 extern u_long (*vec_compat_cvtcmd)(u_long);
 extern int (*vec_compat_ifioctl)(struct socket *, u_long, u_long,
     void *, struct lwp *);
 void if_40_init(void);
 void if_40_fini(void);
 #endif
 #endif /* !_COMPAT_IF_40_H_ */

--- src/sys/net/if.h 2018/03/06 23:27:52	1.258.2.3
+++ src/sys/net/if.h 2018/03/06 23:31:29	1.258.2.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.h,v 1.258.2.3 2018/03/06 23:27:52 pgoyette Exp $	*/
+/*	$NetBSD: if.h,v 1.258.2.4 2018/03/06 23:31:29 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by William Studenmund and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -78,31 +78,28 @@
 #if defined(_NETBSD_SOURCE)
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <net/dlt.h>
 #include <net/pfil.h>
 #ifdef _KERNEL
 #include <net/pktqueue.h>
 #include <sys/pslist.h>
 #include <sys/pserialize.h>
 #include <sys/psref.h>
 #include <net/if.h>
 #endif
 #include <compat/sys/sockio.h>
 /*
  * Always include ALTQ glue here -- we use the ALTQ interface queue
  * structure even when ALTQ is not configured into the kernel so that
  * the size of struct ifnet does not changed based on the option.  The
  * ALTQ queue structure is API-compatible with the legacy ifqueue.
  */
 #include <altq/if_altq.h>
 /*
  * Structures defining a network interface, providing a packet
  * transport mechanism (ala level 0 of the PUP protocols).
+ *
  * Each interface accepts output datagrams of a specified maximum