[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/718a0bb6908d
branches:  netbsd-6
changeset: 773893:718a0bb6908d
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Mar 07 23:36:10 2012 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #100):
        sys/dev/pci/if_bnx.c: revision 1.46
bnx_start() is not MP-safe, so do not create the bnx_alloc_pkts()'s
workqueue MPSAFE. This could lead to bnx_start() being running at
the same time on 2 CPUs, with packets being sent twice.
Problem found and reported by Beverly Schwartz and Greg Troxel.

diffstat:

 sys/dev/pci/if_bnx.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b75be6048b78 -r 718a0bb6908d sys/dev/pci/if_bnx.c
--- a/sys/dev/pci/if_bnx.c      Wed Mar 07 23:33:10 2012 +0000
+++ b/sys/dev/pci/if_bnx.c      Wed Mar 07 23:36:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bnx.c,v 1.45 2011/09/22 08:42:53 jym Exp $  */
+/*     $NetBSD: if_bnx.c,v 1.45.8.1 2012/03/07 23:36:10 riz Exp $      */
 /*     $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
 
 /*-
@@ -35,7 +35,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.45 2011/09/22 08:42:53 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.45.8.1 2012/03/07 23:36:10 riz Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -707,7 +707,7 @@
 
        /* create workqueue to handle packet allocations */
        if (workqueue_create(&sc->bnx_wq, device_xname(self),
-           bnx_alloc_pkts, sc, PRI_NONE, IPL_NET, WQ_MPSAFE) != 0) {
+           bnx_alloc_pkts, sc, PRI_NONE, IPL_NET, 0) != 0) {
                aprint_error_dev(self, "failed to create workqueue\n");
                goto bnx_attach_fail;
        }