Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / drivers / net / yellowfin.c

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index eaafb42..8148219 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -286,7 +286,7 @@ static struct pci_id_info pci_id_tbl[] = {
         FullTxStatus | IsGigabit | HasMulticastBug | HasMACAddrBug | DontUseEeprom},
        {"Symbios SYM83C885", { 0x07011000, 0xffffffff},
         PCI_IOTYPE, YELLOWFIN_SIZE, HasMII | DontUseEeprom },
-       {0,},
+       {NULL,},
 };
 
 static struct pci_device_id yellowfin_pci_tbl[] = {
@@ -805,7 +805,7 @@ static void yellowfin_init_ring(struct net_device *dev)
 #ifdef NO_TXSTATS
        /* In this mode the Tx ring needs only a single descriptor. */
        for (i = 0; i < TX_RING_SIZE; i++) {
-               yp->tx_skbuff[i] = 0;
+               yp->tx_skbuff[i] = NULL;
                yp->tx_ring[i].dbdma_cmd = cpu_to_le32(CMD_STOP);
                yp->tx_ring[i].branch_addr = cpu_to_le32(yp->tx_ring_dma +
                        ((i+1)%TX_RING_SIZE)*sizeof(struct yellowfin_desc));
@@ -987,7 +987,7 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance, struct pt_re
                        pci_unmap_single(yp->pci_dev, yp->tx_ring[entry].addr,
                                skb->len, PCI_DMA_TODEVICE);
                        dev_kfree_skb_irq(skb);
-                       yp->tx_skbuff[entry] = 0;
+                       yp->tx_skbuff[entry] = NULL;
                }
                if (yp->tx_full
                        && yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE - 4) {
@@ -1320,12 +1320,12 @@ static int yellowfin_close(struct net_device *dev)
                if (yp->rx_skbuff[i]) {
                        dev_kfree_skb(yp->rx_skbuff[i]);
                }
-               yp->rx_skbuff[i] = 0;
+               yp->rx_skbuff[i] = NULL;
        }
        for (i = 0; i < TX_RING_SIZE; i++) {
                if (yp->tx_skbuff[i])
                        dev_kfree_skb(yp->tx_skbuff[i]);
-               yp->tx_skbuff[i] = 0;
+               yp->tx_skbuff[i] = NULL;
        }
 
 #ifdef YF_PROTOTYPE                    /* Support for prototype hardware errata. */