direct-io.hg

changeset 1395:2afbaf9592a6

bitkeeper revision 1.891.1.29 (40a622bbu2RlVfjjQ0b4lDdDQDrrXA)

Quick fix for ngio domain shutdown.
author kaf24@scramble.cl.cam.ac.uk
date Sat May 15 14:01:31 2004 +0000 (2004-05-15)
parents da64afd06d32
children 996c4e53641e 23b7fa4bf219
files xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c
line diff
     1.1 --- a/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c	Sat May 15 12:50:25 2004 +0000
     1.2 +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c	Sat May 15 14:01:31 2004 +0000
     1.3 @@ -437,7 +437,10 @@ static int network_close(struct net_devi
     1.4  
     1.5      netif_stop_queue(np->dev);
     1.6  
     1.7 -    while ( (np->rx_resp_cons != np->rx->req_prod) ||
     1.8 +    np->state = NETIF_STATE_CONNECTED;
     1.9 +
    1.10 +    /* XXX We need to properly disconnect via the domain controller. */
    1.11 +    while ( /*(np->rx_resp_cons != np->rx->req_prod) ||*/
    1.12              (np->tx_resp_cons != np->tx->req_prod) )
    1.13      {
    1.14          barrier();
    1.15 @@ -445,10 +448,6 @@ static int network_close(struct net_devi
    1.16          schedule_timeout(1);
    1.17      }
    1.18  
    1.19 -    wmb();
    1.20 -    np->state = NETIF_STATE_CONNECTED;
    1.21 -    wmb();
    1.22 -
    1.23      MOD_DEC_USE_COUNT;
    1.24  
    1.25      return 0;