[src/trunk]: src/sys/net fix: should not assert IFEF_OUTPUT_MPSAFE in bridge_...

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

details:   https://anonhg.NetBSD.org/src/rev/c61da8bec81d
branches:  trunk
changeset: 346041:c61da8bec81d
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Mon Jun 20 08:14:41 2016 +0000

description:
fix: should not assert IFEF_OUTPUT_MPSAFE in bridge_output()

diffstat:

 sys/net/if_bridge.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 4a0801bc7eaa -r c61da8bec81d sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Mon Jun 20 08:14:06 2016 +0000
+++ b/sys/net/if_bridge.c       Mon Jun 20 08:14:41 2016 +0000
@@ -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 @@
        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)