git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
net
/
dl2k.c
diff --git
a/drivers/net/dl2k.c
b/drivers/net/dl2k.c
index
53f01d5
..
39cabaf
100644
(file)
--- a/
drivers/net/dl2k.c
+++ b/
drivers/net/dl2k.c
@@
-583,7
+583,7
@@
alloc_list (struct net_device *dev)
/* Initialize Tx descriptors, TFDListPtr leaves in start_xmit(). */
for (i = 0; i < TX_RING_SIZE; i++) {
/* Initialize Tx descriptors, TFDListPtr leaves in start_xmit(). */
for (i = 0; i < TX_RING_SIZE; i++) {
- np->tx_skbuff[i] =
NULL
;
+ np->tx_skbuff[i] =
0
;
np->tx_ring[i].status = cpu_to_le64 (TFDDone);
np->tx_ring[i].next_desc = cpu_to_le64 (np->tx_ring_dma +
((i+1)%TX_RING_SIZE) *
np->tx_ring[i].status = cpu_to_le64 (TFDDone);
np->tx_ring[i].next_desc = cpu_to_le64 (np->tx_ring_dma +
((i+1)%TX_RING_SIZE) *
@@
-597,7
+597,7
@@
alloc_list (struct net_device *dev)
sizeof (struct netdev_desc));
np->rx_ring[i].status = 0;
np->rx_ring[i].fraginfo = 0;
sizeof (struct netdev_desc));
np->rx_ring[i].status = 0;
np->rx_ring[i].fraginfo = 0;
- np->rx_skbuff[i] =
NULL
;
+ np->rx_skbuff[i] =
0
;
}
/* Allocate the rx buffers */
}
/* Allocate the rx buffers */
@@
-770,7
+770,7
@@
rio_free_tx (struct net_device *dev, int irq)
else
dev_kfree_skb (skb);
else
dev_kfree_skb (skb);
- np->tx_skbuff[entry] =
NULL
;
+ np->tx_skbuff[entry] =
0
;
entry = (entry + 1) % TX_RING_SIZE;
tx_use++;
}
entry = (entry + 1) % TX_RING_SIZE;
tx_use++;
}
@@
-1818,7
+1818,7
@@
rio_close (struct net_device *dev)
pci_unmap_single (np->pdev, np->rx_ring[i].fraginfo,
skb->len, PCI_DMA_FROMDEVICE);
dev_kfree_skb (skb);
pci_unmap_single (np->pdev, np->rx_ring[i].fraginfo,
skb->len, PCI_DMA_FROMDEVICE);
dev_kfree_skb (skb);
- np->rx_skbuff[i] =
NULL
;
+ np->rx_skbuff[i] =
0
;
}
}
for (i = 0; i < TX_RING_SIZE; i++) {
}
}
for (i = 0; i < TX_RING_SIZE; i++) {
@@
-1827,7
+1827,7
@@
rio_close (struct net_device *dev)
pci_unmap_single (np->pdev, np->tx_ring[i].fraginfo,
skb->len, PCI_DMA_TODEVICE);
dev_kfree_skb (skb);
pci_unmap_single (np->pdev, np->tx_ring[i].fraginfo,
skb->len, PCI_DMA_TODEVICE);
dev_kfree_skb (skb);
- np->tx_skbuff[i] =
NULL
;
+ np->tx_skbuff[i] =
0
;
}
}
}
}