Author: rwatson
Date: Wed Sep 10 09:57:32 2014
New Revision: 271373
URL: http://svnweb.freebsd.org/changeset/base/271373
Log:
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
Modified:
head/sys/dev/ce/if_ce.c
head/sys/dev/cp/if_cp.c
head/sys/dev/ctau/if_ct.c
head/sys/dev/cx/if_cx.c
Modified: head/sys/dev/ce/if_ce.c
==============================================================================
--- head/sys/dev/ce/if_ce.c Wed Sep 10 09:47:16 2014 (r271372)
+++ head/sys/dev/ce/if_ce.c Wed Sep 10 09:57:32 2014 (r271373)
@@ -298,22 +298,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.
*/
static struct mbuf *makembuf (void *buf, unsigned len)
@@ -1140,7 +1124,7 @@ static void ce_receive (ce_chan_t *c, un
return;
}
if (c->debug > 1)
- printmbuf (m);
+ m_print (m, 0);
#ifdef NETGRAPH
m->m_pkthdr.rcvif = 0;
IF_ENQUEUE(&d->rqueue, m);
Modified: head/sys/dev/cp/if_cp.c
==============================================================================
--- head/sys/dev/cp/if_cp.c Wed Sep 10 09:47:16 2014 (r271372)
+++ head/sys/dev/cp/if_cp.c Wed Sep 10 09:57:32 2014 (r271373)
@@ -182,22 +182,6 @@ static struct cdevsw cp_cdevsw = {
};
/*
- * 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.
*/
static struct mbuf *makembuf (void *buf, unsigned len)
@@ -909,7 +893,7 @@ static void cp_receive (cp_chan_t *c, un
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);
Modified: head/sys/dev/ctau/if_ct.c
==============================================================================
--- head/sys/dev/ctau/if_ct.c Wed Sep 10 09:47:16 2014 (r271372)
+++ head/sys/dev/ctau/if_ct.c Wed Sep 10 09:57:32 2014 (r271373)
@@ -185,22 +185,6 @@ static struct cdevsw ct_cdevsw = {
};
/*
- * 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.
*/
static struct mbuf *makembuf (void *buf, u_int len)
@@ -1127,7 +1111,7 @@ static void ct_receive (ct_chan_t *c, ch
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);
Modified: head/sys/dev/cx/if_cx.c
==============================================================================
--- head/sys/dev/cx/if_cx.c Wed Sep 10 09:47:16 2014 (r271372)
+++ head/sys/dev/cx/if_cx.c Wed Sep 10 09:57:32 2014 (r271373)
@@ -232,22 +232,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.
*/
static struct mbuf *makembuf (void *buf, u_int len)
@@ -1325,7 +1309,7 @@ static void cx_receive (cx_chan_t *c, ch
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
