change netfront to match xen31_6

fix console locking
This commit is contained in:
Kip Macy 2008-08-20 09:47:49 +00:00
parent f0c96ff802
commit 6ae0e31bcc
2 changed files with 3 additions and 3 deletions

View file

@ -376,12 +376,12 @@ xc_timeout(void *v)
tty_lock(tp);
while ((c = xccncheckc(NULL)) != -1)
ttydisc_rint(tp, c, 0);
tty_unlock(tp);
if (xc_start_needed) {
xc_start_needed = FALSE;
xcoutwakeup(tp);
}
tty_unlock(tp);
callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, tp);
}

View file

@ -148,7 +148,7 @@ static int xennet_get_responses(struct netfront_info *np,
* not the other way around. The size must track the free index arrays.
*/
struct xn_chain_data {
struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1];
struct mbuf *xn_tx_chain[NET_TX_RING_SIZE+1];
struct mbuf *xn_rx_chain[NET_RX_RING_SIZE+1];
};
@ -1203,7 +1203,7 @@ xennet_get_responses(struct netfront_info *np,
mmu = np->rx_mmu + pages_flipped;
MULTI_update_va_mapping(mcl, (u_long)vaddr,
(mfn << PAGE_SHIFT) | PG_RW |
(((vm_paddr_t)mfn) << PAGE_SHIFT) | PG_RW |
PG_V | PG_M | PG_A, 0);
pfn = (uint32_t)m->m_ext.ext_arg1;
mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) |