Change callers of mtx_init() to pass in an appropriate lock type name. In

most cases NULL is passed, but in some cases such as network driver locks
(which use the MTX_NETWORK_LOCK macro) and UMA zone locks, a name is used.

Tested on:	i386, alpha, sparc64

5 files changed, 12 insertions, 11 deletions

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 8ce7d3e..0077e51 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -343,7 +343,7 @@ bpfopen(dev, flags, fmt, td)
 	d->bd_bufsize = bpf_bufsize;
 	d->bd_sig = SIGIO;
 	d->bd_seesent = 1;
-	mtx_init(&d->bd_mtx, devtoname(dev), MTX_DEF);
+	mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF);
 	callout_init(&d->bd_callout, 1);
 
 	return (0);
@@ -1263,7 +1263,7 @@ bpfattach(ifp, dlt, hdrlen)
 
 	bp->bif_ifp = ifp;
 	bp->bif_dlt = dlt;
-	mtx_init(&bp->bif_mtx, "bpf interface lock", MTX_DEF);
+	mtx_init(&bp->bif_mtx, "bpf interface lock", NULL, MTX_DEF);
 
 	mtx_lock(&bpf_mtx);
 	bp->bif_next = bpf_iflist;
@@ -1362,7 +1362,7 @@ bpf_drvinit(unused)
 	void *unused;
 {
 
-	mtx_init(&bpf_mtx, "bpf global lock", MTX_DEF);
+	mtx_init(&bpf_mtx, "bpf global lock", NULL, MTX_DEF);
 	EVENTHANDLER_REGISTER(dev_clone, bpf_clone, 0, 1000);
 	cdevsw_add(&bpf_cdevsw);
 }
diff --git a/sys/net/if.c b/sys/net/if.c
index 4b8573f..854a879 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -301,7 +301,8 @@ if_check(dummy)
 		if (!mtx_initialized(&ifp->if_snd.ifq_mtx)) {
 			printf("%s%d XXX: driver didn't initialize queue mtx\n",
 			    ifp->if_name, ifp->if_unit);
-			mtx_init(&ifp->if_snd.ifq_mtx, "unknown", MTX_DEF);
+			mtx_init(&ifp->if_snd.ifq_mtx, "unknown",
+			    MTX_NETWORK_LOCK, MTX_DEF);
 		}
 	}
 	splx(s);
@@ -398,7 +399,7 @@ if_attach(ifp)
 	make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d",
 	    net_cdevsw.d_name, ifp->if_index);
 
-	mtx_init(&ifp->if_snd.ifq_mtx, ifp->if_name, MTX_DEF);
+	mtx_init(&ifp->if_snd.ifq_mtx, ifp->if_name, "if send queue", MTX_DEF);
 
 	/*
 	 * create a Link Level name for this device
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index eb90809..eb5f072 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -208,9 +208,9 @@ pppattach(void)
 	sc->sc_inq.ifq_maxlen = IFQ_MAXLEN;
 	sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN;
 	sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN;
-        mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", MTX_DEF);
-        mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", MTX_DEF);
-        mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", MTX_DEF);
+        mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", NULL, MTX_DEF);
+        mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", NULL, MTX_DEF);
+        mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", NULL, MTX_DEF);
 	if_attach(&sc->sc_if);
 	bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN);
     }
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 687e9bb..cae7915 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -304,7 +304,7 @@ slcreate()
 	sc->sc_fastq.ifq_maxlen = 32;
 	sc->sc_if.if_linkmib = sc;
 	sc->sc_if.if_linkmiblen = sizeof *sc;
-	mtx_init(&sc->sc_fastq.ifq_mtx, "sl_fastq", MTX_DEF);
+	mtx_init(&sc->sc_fastq.ifq_mtx, "sl_fastq", NULL, MTX_DEF);
 
 	/*
 	 * Find a suitable unit number.
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 600179e..807cdb5 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1023,9 +1023,9 @@ sppp_attach(struct ifnet *ifp)
 	sp->pp_up = lcp.Up;
 	sp->pp_down = lcp.Down;
 	if(!mtx_initialized(&sp->pp_cpq.ifq_mtx))
-		mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", MTX_DEF);
+		mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", NULL, MTX_DEF);
 	if(!mtx_initialized(&sp->pp_fastq.ifq_mtx))
-		mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", MTX_DEF);
+		mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", NULL, MTX_DEF);
 	sp->pp_last_recv = sp->pp_last_sent = time_second;
 	sp->confflags = 0;
 #ifdef INET