Module Name: src
Committed By: knakahara
Date: Mon Jun 20 08:14:41 UTC 2016
Modified Files:
src/sys/net: if_bridge.c
Log Message:
fix: should not assert IFEF_OUTPUT_MPSAFE in bridge_output()
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/net/if_bridge.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_bridge.c
diff -u src/sys/net/if_bridge.c:1.127 src/sys/net/if_bridge.c:1.128
--- src/sys/net/if_bridge.c:1.127 Mon Jun 20 07:23:56 2016
+++ src/sys/net/if_bridge.c Mon Jun 20 08:14:41 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.127 2016/06/20 07:23:56 knakahara Exp $ */
+/* $NetBSD: if_bridge.c,v 1.128 2016/06/20 08:14:41 knakahara Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.127 2016/06/20 07:23:56 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.128 2016/06/20 08:14:41 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1428,6 +1428,12 @@ bridge_output(struct ifnet *ifp, struct
struct bridge_softc *sc;
int s;
+ /*
+ * bridge_output() is called from ether_output(), furthermore
+ * ifp argument doesn't point to bridge(4). So, don't assert
+ * IFEF_OUTPUT_MPSAFE here.
+ */
+
if (m->m_len < ETHER_HDR_LEN) {
m = m_pullup(m, ETHER_HDR_LEN);
if (m == NULL)
