diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-10-18 04:26:07 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-10-18 04:26:07 +0000 |
| commit | 9f39b725b3f50d0ab83ff4ddbff543ff5e4567ed (patch) | |
| tree | acac27af1db3fec6de2c5a385dfbff25afc8d3ce /sys/dev/xen/netfront | |
| parent | a116ee3ecb2e7a46e0fec4c4c48d1f51a1c827d0 (diff) | |
| download | FreeBSD-src-9f39b725b3f50d0ab83ff4ddbff543ff5e4567ed.zip FreeBSD-src-9f39b725b3f50d0ab83ff4ddbff543ff5e4567ed.tar.gz | |
Add newline to sys/conf/files so that netfront.c compiles, s/ext_arg1/ext_args/
Diffstat (limited to 'sys/dev/xen/netfront')
| -rw-r--r-- | sys/dev/xen/netfront/netfront.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index 748c8a7..3a29ffb 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/socket.h> #include <sys/queue.h> +#include <sys/lock.h> #include <sys/sx.h> #include <net/if.h> @@ -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_info *np, 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; |
