[src/trunk]: src/sys/net Include <netinet/in.h> before <netinet/in_var.h> to ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/265a44e39967
branches:  trunk
changeset: 329762:265a44e39967
user:      he <he%NetBSD.org@localhost>
date:      Sat Jun 07 13:25:33 2014 +0000

description:
Include <netinet/in.h> before <netinet/in_var.h> to avoid build failure
for the COMPUTEX7750 kernel of evbsh3-eb.
Also, don't reference ip_pktq if INET isn't defined (found by the same
kernel).

diffstat:

 sys/net/if.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 146765bf3759 -r 265a44e39967 sys/net/if.c
--- a/sys/net/if.c      Sat Jun 07 11:08:09 2014 +0000
+++ b/sys/net/if.c      Sat Jun 07 13:25:33 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.c,v 1.277 2014/06/06 01:02:47 rmind Exp $   */
+/*     $NetBSD: if.c,v 1.278 2014/06/07 13:25:33 he Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.277 2014/06/06 01:02:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.278 2014/06/07 13:25:33 he Exp $");
 
 #include "opt_inet.h"
 
@@ -130,10 +130,10 @@
 #include <netatalk/at.h>
 #endif
 #include <net/pfil.h>
+#include <netinet/in.h>
 #include <netinet/in_var.h>
 
 #ifdef INET6
-#include <netinet/in.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 #endif
@@ -872,7 +872,9 @@
         * ensures that the packets are dequeued while a cross-call will
         * ensure that the interrupts have completed. FIXME: not quite..
         */
+#ifdef INET
        pktq_barrier(ip_pktq);
+#endif
        xc = xc_broadcast(0, (xcfunc_t)nullop, NULL, NULL);
        xc_wait(xc);