Use if_printf(ifp, "blah") instead of

printf("%s%d: blah", ifp->if_name, ifp->if_xname).

15 files changed, 15 insertions, 29 deletions

diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index 556d1ff..6225157 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index faf89be..ea0b946 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -288,8 +288,7 @@ bpf_detachd(d)
 			 * the driver into promiscuous mode, but can't
 			 * take it out.
 			 */
-			printf("%s%d: ifpromisc failed %d\n",
-			    bp->bif_ifp->if_name, bp->bif_ifp->if_unit, error);
+			if_printf(bp->bif_ifp, "ifpromisc failed %d\n", error);
 		}
 	}
 	/* Remove d from the interface's descriptor list. */
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index affd7dd..a11dc44 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -196,8 +196,7 @@ arc_output(ifp, m, dst, rt0)
 		break;
 
 	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-		    dst->sa_family);
+		if_printf(ifp, "can't handle af%d\n", dst->sa_family);
 		senderr(EAFNOSUPPORT);
 	}
 
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 5db1505..2cef975 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -307,8 +307,7 @@ ether_output(ifp, m, dst, rt0)
 		break;
 
 	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
+		if_printf(ifp, "can't handle af%d\n", dst->sa_family);
 		senderr(EAFNOSUPPORT);
 	}
 
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 680ed0d..b1c6fce 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -280,8 +280,7 @@ fddi_output(ifp, m, dst, rt0)
 		goto queue_it;
 	}
 	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
+		if_printf(ifp, "can't handle af%d\n", dst->sa_family);
 		senderr(EAFNOSUPPORT);
 	}
 
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index e95a471..e55bf45 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -335,8 +335,7 @@ iso88025_output(ifp, m, dst, rt0)
 		break;
 	}
 	default:
-		printf("%s%d: can't handle af%d\n", ifp->if_name, ifp->if_unit,
-			dst->sa_family);
+		if_printf(ifp, "can't handle af%d\n", dst->sa_family);
 		senderr(EAFNOSUPPORT);
 		break;
 	}
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index bf29dca..5deac9e 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -471,7 +471,7 @@ ng_iface_output(struct ifnet *ifp, struct mbuf *m,
 static void
 ng_iface_start(struct ifnet *ifp)
 {
-	printf("%s%d: %s called?", ifp->if_name, ifp->if_unit, __func__);
+	if_printf(ifp, "%s called?", __func__);
 }
 
 /*
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 556d1ff..6225157 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -2753,8 +2753,7 @@ mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf)
 
 	KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr"));
 	if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
-		printf("%s%d: not initialized\n", ifnet->if_name,
-		    ifnet->if_unit);
+		if_printf(ifnet, "not initialized\n");
 
 	MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf,
 	    &mbuf->m_pkthdr.label);