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

6 files changed, 16 insertions, 16 deletions

diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index d072b9c..5be982d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -652,14 +652,14 @@ avma1pp_attach_avma1pp(device_t dev)
 	/* Init the channel mutexes */
 	chan = &sc->sc_chan[HSCX_CH_A];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", NULL, MTX_DEF);
 	chan = &sc->sc_chan[HSCX_CH_B];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp_tx", NULL, MTX_DEF);
 #endif
 
 	/* init the "HSCX" */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 01794f3..981473b 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -582,14 +582,14 @@ avma1pp2_attach_avma1pp(device_t dev)
 	/* Init the channel mutexes */
 	chan = &sc->sc_chan[HSCX_CH_A];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", NULL, MTX_DEF);
 	chan = &sc->sc_chan[HSCX_CH_B];
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avma1pp2_rx", NULL, MTX_DEF);
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avma1pp2_tx", NULL, MTX_DEF);
 #endif
 
 	/* init the "HSCX" */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index 89c5550..bb8c5f1 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -1047,7 +1047,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avm_pnp_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_avm_pnp_rx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
@@ -1066,7 +1066,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avm_pnp_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_avm_pnp_tx", NULL, MTX_DEF);
 #endif
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 06254db..db31c8c 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -361,7 +361,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 			if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
-				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", MTX_DEF);
+				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", NULL, MTX_DEF);
 #endif
 			if (!activate) continue;
 
@@ -387,7 +387,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 			if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
-				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", MTX_DEF);
+				mtx_init(&S_IFQUEUE.ifq_mtx, "i4b_ihfc", NULL, MTX_DEF);
 #endif
 			S_PROT = prot;
 
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index f8b6f0d..580e9a9 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -90,7 +90,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 	chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", NULL, MTX_DEF);
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
 
@@ -107,7 +107,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
 	chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
 
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", NULL, MTX_DEF);
 	
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */
 
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 2856992..510025e 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -436,7 +436,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4
 	if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
-		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_iwic_rx", MTX_DEF);
+		mtx_init(&chan->rx_queue.ifq_mtx, "i4b_iwic_rx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->rx_queue);	/* clean rx queue */
@@ -455,7 +455,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
 
 #if defined (__FreeBSD__) && __FreeBSD__ > 4	
 	if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
-		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_iwic_tx", MTX_DEF);
+		mtx_init(&chan->tx_queue.ifq_mtx, "i4b_iwic_tx", NULL, MTX_DEF);
 #endif
 
 	i4b_Bcleanifq(&chan->tx_queue);	/* clean tx queue */