ia64/xen-unstable

changeset 950:7c5471a2cb87

bitkeeper revision 1.606 (3fb7c711FIosxWIF_j9XSEkZmDWlug)

dev.c, dom_mem_ops.c:
Bug fixes.
author kaf24@scramble.cl.cam.ac.uk
date Sun Nov 16 18:50:57 2003 +0000 (2003-11-16)
parents ad93f972420f
children 87fcc882f083
files xen/common/dom_mem_ops.c xen/net/dev.c
line diff
     1.1 --- a/xen/common/dom_mem_ops.c	Sun Nov 16 18:42:19 2003 +0000
     1.2 +++ b/xen/common/dom_mem_ops.c	Sun Nov 16 18:50:57 2003 +0000
     1.3 @@ -111,7 +111,7 @@ static long free_dom_mem(struct task_str
     1.4          pf = &frame_table[mpfn];
     1.5          if ( (pf->type_count != 0) || 
     1.6               (pf->tot_count != 0) ||
     1.7 -             (pf->flags & PG_domain_mask != p->domain) )
     1.8 +             ((pf->flags & PG_domain_mask) != p->domain) )
     1.9          {
    1.10              DPRINTK("Bad page free for domain %d (%ld, %ld, %08lx)\n",
    1.11                      p->domain, pf->type_count, pf->tot_count, pf->flags);
     2.1 --- a/xen/net/dev.c	Sun Nov 16 18:42:19 2003 +0000
     2.2 +++ b/xen/net/dev.c	Sun Nov 16 18:50:57 2003 +0000
     2.3 @@ -1967,7 +1967,8 @@ static int get_tx_bufs(net_vif_t *vif)
     2.4              skb->len = tx.size - ETH_HLEN;
     2.5              unmap_domain_mem(skb->head);
     2.6  
     2.7 -            netif_rx(skb);
     2.8 +            if ( netif_rx(skb) == NET_RX_DROP )
     2.9 +                kfree_skb(skb);
    2.10  
    2.11              __make_tx_response(vif, tx.id, RING_STATUS_OK);
    2.12          }