direct-io.hg

changeset 1429:4a84a7bb8d01

bitkeeper revision 1.933 (40bf3525hFMjFAa5gldqfMUKAsYBkQ)

Fix compile errors / warnings.
author mwilli2@equilibrium.research.intel-research.net
date Thu Jun 03 14:26:45 2004 +0000 (2004-06-03)
parents d4eecc615039
children 24ad109055b6
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:40:45 2004 +0000
     1.2 +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c	Thu Jun 03 14:26:45 2004 +0000
     1.3 @@ -494,9 +494,6 @@ static void netif_status_change(netif_fe
     1.4      netif_fe_interface_connect_t up;
     1.5      struct net_device *dev;
     1.6      struct net_private *np;
     1.7 -    int i;
     1.8 -
     1.9 -    unsigned long tsc;
    1.10  
    1.11      if ( status->handle != 0 )
    1.12      {
    1.13 @@ -608,7 +605,7 @@ static void netif_status_change(netif_fe
    1.14               */
    1.15              for ( requeue_idx = 0, i = 1; i <= NETIF_TX_RING_SIZE; i++ )
    1.16              {
    1.17 -                if ( np->tx_skbs[i] >= __PAGE_OFFSET )
    1.18 +                if ( (unsigned long)np->tx_skbs[i] >= __PAGE_OFFSET )
    1.19                  {
    1.20                      struct sk_buff *skb = np->tx_skbs[i];
    1.21                      
    1.22 @@ -627,7 +624,7 @@ static void netif_status_change(netif_fe
    1.23  
    1.24              /* Rebuild the RX buffer freelist and the RX ring itself. */
    1.25              for ( requeue_idx = 0, i = 1; i <= NETIF_RX_RING_SIZE; i++ )
    1.26 -                if ( np->rx_skbs[i] >= __PAGE_OFFSET )
    1.27 +                if ( (unsigned long)np->rx_skbs[i] >= __PAGE_OFFSET )
    1.28                      np->rx->ring[requeue_idx++].req.id = i;
    1.29              wmb();                
    1.30              np->rx->req_prod = requeue_idx;
    1.31 @@ -642,7 +639,7 @@ static void netif_status_change(netif_fe
    1.32  
    1.33              notify_via_evtchn(status->evtchn);  
    1.34  
    1.35 -	    network_tx_buf_gc();
    1.36 +	    network_tx_buf_gc(dev);
    1.37  
    1.38              printk(KERN_INFO "Recovery completed\n");
    1.39