From owner-svn-src-projects@FreeBSD.ORG Sat Oct 18 04:26:08 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EA6D1065686; Sat, 18 Oct 2008 04:26:08 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1658FC12; Sat, 18 Oct 2008 04:26:08 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9I4Q8xj006646; Sat, 18 Oct 2008 04:26:08 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9I4Q87T006644; Sat, 18 Oct 2008 04:26:08 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200810180426.m9I4Q87T006644@svn.freebsd.org> From: Kip Macy Date: Sat, 18 Oct 2008 04:26:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184011 - in projects/releng_6_xen/sys: conf dev/xen/netfront X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2008 04:26:08 -0000 Author: kmacy Date: Sat Oct 18 04:26:07 2008 New Revision: 184011 URL: http://svn.freebsd.org/changeset/base/184011 Log: Add newline to sys/conf/files so that netfront.c compiles, s/ext_arg1/ext_args/ Modified: projects/releng_6_xen/sys/conf/files projects/releng_6_xen/sys/dev/xen/netfront/netfront.c Modified: projects/releng_6_xen/sys/conf/files ============================================================================== --- projects/releng_6_xen/sys/conf/files Sat Oct 18 04:13:51 2008 (r184010) +++ projects/releng_6_xen/sys/conf/files Sat Oct 18 04:26:07 2008 (r184011) @@ -2060,4 +2060,4 @@ xen/xenbus/xenbus_xs.c optional dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen \ No newline at end of file +dev/xen/netfront/netfront.c optional xen Modified: projects/releng_6_xen/sys/dev/xen/netfront/netfront.c ============================================================================== --- projects/releng_6_xen/sys/dev/xen/netfront/netfront.c Sat Oct 18 04:13:51 2008 (r184010) +++ projects/releng_6_xen/sys/dev/xen/netfront/netfront.c Sat Oct 18 04:26:07 2008 (r184011) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -347,7 +348,7 @@ makembuf (struct mbuf *buf) m->m_len = buf->m_len; m_copydata(buf, 0, buf->m_pkthdr.len, mtod(m,caddr_t) ); - m->m_ext.ext_arg1 = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT); + m->m_ext.ext_args = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT); return m; } @@ -749,7 +750,7 @@ refill: if ((m_new = mbufq_dequeue(&sc->xn_rx_batch)) == NULL) break; - m_new->m_ext.ext_arg1 = (vm_paddr_t *)(uintptr_t)( + m_new->m_ext.ext_args = (vm_paddr_t *)(uintptr_t)( vtophys(m_new->m_ext.ext_buf) >> PAGE_SHIFT); id = xennet_rxidx(req_prod + i); @@ -1214,7 +1215,7 @@ xennet_get_responses(struct netfront_inf MULTI_update_va_mapping(mcl, (u_long)vaddr, (((vm_paddr_t)mfn) << PAGE_SHIFT) | PG_RW | PG_V | PG_M | PG_A, 0); - pfn = (uint32_t)m->m_ext.ext_arg1; + pfn = (uint32_t)m->m_ext.ext_args; mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; mmu->val = pfn;