r254804 and r254807 changed the types of some of the members of the mbuf struct, and introduced some compile time errors in netback debug messages that prevented compiling a XENHVM kernel. Cc: andre_at_freebsd.org --- sys/dev/xen/netback/netback.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index f18b791..16a54d9 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c _at__at_ -585,16 +585,16 _at__at_ xnb_dump_mbuf(const struct mbuf *m) printf("xnb_dump_mbuf:\n"); if (m->m_flags & M_PKTHDR) { - printf(" flowid=%10d, csum_flags=%#8x, csum_data=%#8x, " + printf(" flowid=%10d, csum_flags=%b, csum_data=%#8x, " "tso_segsz=%5hd\n", - m->m_pkthdr.flowid, m->m_pkthdr.csum_flags, + m->m_pkthdr.flowid, (int)m->m_pkthdr.csum_flags, CSUM_BITS, m->m_pkthdr.csum_data, m->m_pkthdr.tso_segsz); printf(" rcvif=%16p, header=%18p, len=%19d\n", - m->m_pkthdr.rcvif, m->m_pkthdr.header, m->m_pkthdr.len); + m->m_pkthdr.rcvif, m->m_pkthdr.PH_loc.ptr, m->m_pkthdr.len); } printf(" m_next=%16p, m_nextpk=%16p, m_data=%16p\n", m->m_next, m->m_nextpkt, m->m_data); - printf(" m_len=%17d, m_flags=%#15x, m_type=%18hd\n", + printf(" m_len=%17d, m_flags=%#15x, m_type=%u\n", m->m_len, m->m_flags, m->m_type); len = m->m_len; -- 1.7.7.5 (Apple Git-26)Received on Mon Aug 26 2013 - 09:04:22 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:40 UTC