Module Name: src
Committed By: he
Date: Sat Jun 7 13:25:33 UTC 2014
Modified Files:
src/sys/net: if.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/net/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.277 src/sys/net/if.c:1.278
--- src/sys/net/if.c:1.277 Fri Jun 6 01:02:47 2014
+++ src/sys/net/if.c Sat Jun 7 13:25:33 2014
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if.c,v 1.277
#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 @@ again:
* 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);
