[src/trunk]: src/sys/net Don't share struct work, instead have one per softc

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/195d0299462e
branches:  trunk
changeset: 813660:195d0299462e
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Feb 10 06:30:23 2016 +0000

description:
Don't share struct work, instead have one per softc

Pointed out by riastradh@

diffstat:

 sys/net/if_bridge.c    |  9 ++++-----
 sys/net/if_bridgevar.h |  3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r db10bdec3339 -r 195d0299462e sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Tue Feb 09 20:44:26 2016 +0000
+++ b/sys/net/if_bridge.c       Wed Feb 10 06:30:23 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridge.c,v 1.106 2016/02/09 08:32:12 ozaki-r Exp $  */
+/*     $NetBSD: if_bridge.c,v 1.107 2016/02/10 06:30:23 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.106 2016/02/09 08:32:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.107 2016/02/10 06:30:23 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -217,7 +217,6 @@
 int    bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
 
 static struct pool bridge_rtnode_pool;
-static struct work bridge_rtage_wk;
 
 static int     bridge_clone_create(struct if_clone *, int);
 static int     bridge_clone_destroy(struct ifnet *);
@@ -2275,7 +2274,7 @@
 {
        struct bridge_softc *sc = arg;
 
-       workqueue_enqueue(sc->sc_rtage_wq, &bridge_rtage_wk, NULL);
+       workqueue_enqueue(sc->sc_rtage_wq, &sc->sc_rtage_wk, NULL);
 }
 
 static void
@@ -2283,7 +2282,7 @@
 {
        struct bridge_softc *sc = arg;
 
-       KASSERT(wk == &bridge_rtage_wk);
+       KASSERT(wk == &sc->sc_rtage_wk);
 
        bridge_rtage(sc);
 
diff -r db10bdec3339 -r 195d0299462e sys/net/if_bridgevar.h
--- a/sys/net/if_bridgevar.h    Tue Feb 09 20:44:26 2016 +0000
+++ b/sys/net/if_bridgevar.h    Wed Feb 10 06:30:23 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridgevar.h,v 1.24 2015/06/01 06:14:43 matt Exp $   */
+/*     $NetBSD: if_bridgevar.h,v 1.25 2016/02/10 06:30:23 ozaki-r Exp $        */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -322,6 +322,7 @@
        kmutex_t                *sc_rtlist_lock;
        pserialize_t            sc_rtlist_psz;
        struct workqueue        *sc_rtage_wq;
+       struct work             sc_rtage_wk;
        uint32_t                sc_rthash_key;  /* key for hash */
        uint32_t                sc_filter_flags; /* ipf and flags */
        pktqueue_t *            sc_fwd_pktq;