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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
eepro100.c
diff --git
a/drivers/net/eepro100.c
b/drivers/net/eepro100.c
index
56fc878
..
36b5508
100644
(file)
--- a/
drivers/net/eepro100.c
+++ b/
drivers/net/eepro100.c
@@
-87,12
+87,6
@@
static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
/* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/
#define PKT_BUF_SZ 1536
/* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/
#define PKT_BUF_SZ 1536
-#if !defined(__OPTIMIZE__) || !defined(__KERNEL__)
-#warning You must compile this file with the correct options!
-#warning See the last lines of the source file.
-#error You must compile this driver with "-O".
-#endif
-
#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
@@
-1027,7
+1021,7
@@
speedo_open(struct net_device *dev)
/* Set up the Tx queue early.. */
sp->cur_tx = 0;
sp->dirty_tx = 0;
/* Set up the Tx queue early.. */
sp->cur_tx = 0;
sp->dirty_tx = 0;
- sp->last_cmd =
0
;
+ sp->last_cmd =
NULL
;
sp->tx_full = 0;
sp->in_interrupt = 0;
sp->tx_full = 0;
sp->in_interrupt = 0;
@@
-1361,7
+1355,7
@@
static void speedo_purge_tx(struct net_device *dev)
le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(sp->tx_skbuff[entry]);
le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(sp->tx_skbuff[entry]);
- sp->tx_skbuff[entry] =
0
;
+ sp->tx_skbuff[entry] =
NULL
;
}
sp->dirty_tx++;
}
}
sp->dirty_tx++;
}
@@
-1565,7
+1559,7
@@
static void speedo_tx_buffer_gc(struct net_device *dev)
le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(sp->tx_skbuff[entry]);
le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(sp->tx_skbuff[entry]);
- sp->tx_skbuff[entry] =
0
;
+ sp->tx_skbuff[entry] =
NULL
;
}
dirty_tx++;
}
}
dirty_tx++;
}
@@
-1938,7
+1932,7
@@
speedo_close(struct net_device *dev)
/* Free all the skbuffs in the Rx and Tx queues. */
for (i = 0; i < RX_RING_SIZE; i++) {
struct sk_buff *skb = sp->rx_skbuff[i];
/* Free all the skbuffs in the Rx and Tx queues. */
for (i = 0; i < RX_RING_SIZE; i++) {
struct sk_buff *skb = sp->rx_skbuff[i];
- sp->rx_skbuff[i] =
0
;
+ sp->rx_skbuff[i] =
NULL
;
/* Clear the Rx descriptors. */
if (skb) {
pci_unmap_single(sp->pdev,
/* Clear the Rx descriptors. */
if (skb) {
pci_unmap_single(sp->pdev,
@@
-1950,7
+1944,7
@@
speedo_close(struct net_device *dev)
for (i = 0; i < TX_RING_SIZE; i++) {
struct sk_buff *skb = sp->tx_skbuff[i];
for (i = 0; i < TX_RING_SIZE; i++) {
struct sk_buff *skb = sp->tx_skbuff[i];
- sp->tx_skbuff[i] =
0
;
+ sp->tx_skbuff[i] =
NULL
;
/* Clear the Tx descriptors. */
if (skb) {
pci_unmap_single(sp->pdev,
/* Clear the Tx descriptors. */
if (skb) {
pci_unmap_single(sp->pdev,
@@
-2180,7
+2174,7
@@
static void set_rx_mode(struct net_device *dev)
last_cmd = sp->last_cmd;
sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
last_cmd = sp->last_cmd;
sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
- sp->tx_skbuff[entry] =
0;
/* Redundant. */
+ sp->tx_skbuff[entry] =
NULL;
/* Redundant. */
sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdConfigure);
sp->tx_ring[entry].link =
cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdConfigure);
sp->tx_ring[entry].link =
cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
@@
-2223,7
+2217,7
@@
static void set_rx_mode(struct net_device *dev)
last_cmd = sp->last_cmd;
sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
last_cmd = sp->last_cmd;
sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
- sp->tx_skbuff[entry] =
0
;
+ sp->tx_skbuff[entry] =
NULL
;
sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdMulticastList);
sp->tx_ring[entry].link =
cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdMulticastList);
sp->tx_ring[entry].link =
cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
@@
-2304,7
+2298,7
@@
static void set_rx_mode(struct net_device *dev)
sp->last_cmd = mc_setup_frm;
/* Change the command to a NoOp, pointing to the CmdMulti command. */
sp->last_cmd = mc_setup_frm;
/* Change the command to a NoOp, pointing to the CmdMulti command. */
- sp->tx_skbuff[entry] =
0
;
+ sp->tx_skbuff[entry] =
NULL
;
sp->tx_ring[entry].status = cpu_to_le32(CmdNOp);
sp->tx_ring[entry].link = cpu_to_le32(mc_blk->frame_dma);
sp->tx_ring[entry].status = cpu_to_le32(CmdNOp);
sp->tx_ring[entry].link = cpu_to_le32(mc_blk->frame_dma);