From 620dbb4ed12553d321e7a960129b6191ee75f698 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 10 Sep 2014 09:57:32 +0000
Subject: [PATCH] Replace local copy-and-paste implementations of printmbuf()
 in several device drivers with calls to the centralised m_print()
 implementation. While the formatting and output details differ a little, the
 content is essentially the same, and it is unlikely anyone has used this
 debugging output in some time.

This change reduces awareness of mbuf cluster allocation (and,
especially, the M_EXT flag) outside of the mbuf allocator, which will
make it easier to refine the external storage mechanism without
disrupting drivers in the future.

Style bugs are preserved.

Reviewed by:	bz, glebius
MFC after:	3 days
Sponsored by:	EMC / Isilon Storage Division
---
 sys/dev/ce/if_ce.c   | 18 +-----------------
 sys/dev/cp/if_cp.c   | 18 +-----------------
 sys/dev/ctau/if_ct.c | 18 +-----------------
 sys/dev/cx/if_cx.c   | 18 +-----------------
 4 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 899f33f38dc..6d77a1cd6d0 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -297,22 +297,6 @@ static struct cdevsw ce_cdevsw = {
 };
 #endif
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1140,7 +1124,7 @@ static void ce_receive (ce_chan_t *c, unsigned char *data, int len)
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	IF_ENQUEUE(&d->rqueue, m);
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index ec5f0421280..4c728fcf7e4 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -181,22 +181,6 @@ static struct cdevsw cp_cdevsw = {
 	.d_name     = "cp",
 };
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -909,7 +893,7 @@ static void cp_receive (cp_chan_t *c, unsigned char *data, int len)
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 958faa54de8..43ea9749194 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -184,22 +184,6 @@ static struct cdevsw ct_cdevsw = {
 	.d_name     = "ct",
 };
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1127,7 +1111,7 @@ static void ct_receive (ct_chan_t *c, char *data, int len)
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 27112d5032f..83cac320530 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -231,22 +231,6 @@ static struct cdevsw cx_cdevsw = {
 
 static int MY_SOFT_INTR;
 
-/*
- * Print the mbuf chain, for debug purposes only.
- */
-static void printmbuf (struct mbuf *m)
-{
-	printf ("mbuf:");
-	for (; m; m=m->m_next) {
-		if (m->m_flags & M_PKTHDR)
-			printf (" HDR %d:", m->m_pkthdr.len);
-		if (m->m_flags & M_EXT)
-			printf (" EXT:");
-		printf (" %d", m->m_len);
-	}
-	printf ("\n");
-}
-
 /*
  * Make an mbuf from data.
  */
@@ -1325,7 +1309,7 @@ static void cx_receive (cx_chan_t *c, char *data, int len)
 		return;
 	}
 	if (c->debug > 1)
-		printmbuf (m);
+		m_print (m, 0);
 #ifdef NETGRAPH
 	m->m_pkthdr.rcvif = 0;
 	NG_SEND_DATA_ONLY (error, d->hook, m);