ia64/xen-unstable

changeset 1428:d4eecc615039

bitkeeper revision 1.932 (40bf2a5djG3VqKeDegNbdK8XJmQAIQ)

Minor tweaks.
author mwilli2@equilibrium.research.intel-research.net
date Thu Jun 03 13:40:45 2004 +0000 (2004-06-03)
parents 73eb554453db
children 4a84a7bb8d01
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	Thu Jun 03 13:33:37 2004 +0000
     1.2 +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c	Thu Jun 03 13:40:45 2004 +0000
     1.3 @@ -523,7 +523,7 @@ static void netif_status_change(netif_fe
     1.4  	    printk(KERN_INFO "Attempting to reconnect network interface\n");
     1.5  
     1.6              /* Begin interface recovery.
     1.7 -             * TODO: Change the Xend<->Guest protocol so that a recovery
     1.8 +             * TODO: (MAW) Change the Xend<->Guest protocol so that a recovery
     1.9               * is initiated by a special "RESET" message - disconnect could
    1.10               * just mean we're not allowed to use this interface any more.
    1.11               */
    1.12 @@ -591,7 +591,7 @@ static void netif_status_change(netif_fe
    1.13              np->rx_resp_cons = np->tx_resp_cons = np->tx_full = 0;
    1.14              np->rx->event = 1;
    1.15  
    1.16 -            /* Step 1: Rebuild the RX and TX ring contents.
    1.17 +            /* Step 2: Rebuild the RX and TX ring contents.
    1.18               * NB. We could just throw away the queued TX packets but we hope
    1.19               * that sending them out might do some good.  We have to rebuild
    1.20               * the RX ring because some of our pages are currently flipped out
    1.21 @@ -632,9 +632,9 @@ static void netif_status_change(netif_fe
    1.22              wmb();                
    1.23              np->rx->req_prod = requeue_idx;
    1.24  
    1.25 -            /* Step 4: All public and private state should now be sane.  Start
    1.26 +            /* Step 3: All public and private state should now be sane.  Start
    1.27               * sending and receiving packets again and give the driver domain a
    1.28 -	     * kick because we've probably just queued some packets. */
    1.29 +	     * kick because we've probably just requeued some packets. */
    1.30  
    1.31              netif_carrier_on(dev);
    1.32              netif_start_queue(dev);
    1.33 @@ -642,6 +642,8 @@ static void netif_status_change(netif_fe
    1.34  
    1.35              notify_via_evtchn(status->evtchn);  
    1.36  
    1.37 +	    network_tx_buf_gc();
    1.38 +
    1.39              printk(KERN_INFO "Recovery completed\n");
    1.40  
    1.41              spin_unlock(&np->tx_lock);