From owner-freebsd-current@FreeBSD.ORG Mon Aug 26 11:04:22 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C10BDB9B; Mon, 26 Aug 2013 11:04:22 +0000 (UTC) (envelope-from roger.pau@citrix.com) Received: from SMTP.EU.CITRIX.COM (smtp.eu.citrix.com [46.33.159.39]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D5692658; Mon, 26 Aug 2013 11:04:21 +0000 (UTC) X-IronPort-AV: E=Sophos;i="4.89,957,1367971200"; d="scan'208";a="8097589" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 26 Aug 2013 11:04:14 +0000 Received: from localhost.localdomain (10.68.19.166) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.298.1; Mon, 26 Aug 2013 12:04:14 +0100 From: Roger Pau Monne To: Subject: [PATCH] xen-netback: fix compile errors introduced by r254804 and r254807 Date: Mon, 26 Aug 2013 13:02:01 +0200 Message-ID: <1377514921-2132-1-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 1.7.7.5 (Apple Git-26) MIME-Version: 1.0 Content-Type: text/plain Cc: andre@freebsd.org, Roger Pau Monne X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Aug 2013 11:04:22 -0000 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@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 @@ -585,16 +585,16 @@ 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)