Module Name: src
Committed By: ozaki-r
Date: Tue Mar 7 01:53:53 UTC 2017
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Remove unnecessary splnet for bridge_enqueue
bridge_enqueue now uses if_transmit_lock that does splnet for device
drivers, so splnet for bridge_enqueue isn't needed anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 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.133 src/sys/net/if_bridge.c:1.134
--- src/sys/net/if_bridge.c:1.133 Thu Feb 16 08:12:44 2017
+++ src/sys/net/if_bridge.c Tue Mar 7 01:53:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.133 2017/02/16 08:12:44 knakahara Exp $ */
+/* $NetBSD: if_bridge.c,v 1.134 2017/03/07 01:53:53 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.133 2017/02/16 08:12:44 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134 2017/03/07 01:53:53 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1522,13 +1522,7 @@ bridge_output(struct ifnet *ifp, struct
}
}
-#ifndef NET_MPSAFE
- s = splnet();
-#endif
bridge_enqueue(sc, dst_if, mc, 0);
-#ifndef NET_MPSAFE
- splx(s);
-#endif
if ((m->m_flags & (M_MCAST | M_BCAST)) != 0 &&
dst_if != ifp)
@@ -1585,13 +1579,7 @@ next:
return (0);
}
-#ifndef NET_MPSAFE
- s = splnet();
-#endif
bridge_enqueue(sc, dst_if, m, 0);
-#ifndef NET_MPSAFE
- splx(s);
-#endif
return (0);
}
