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
/
mace.c
diff --git
a/drivers/net/mace.c
b/drivers/net/mace.c
index
cde3ee3
..
fab5607
100644
(file)
--- a/
drivers/net/mace.c
+++ b/
drivers/net/mace.c
@@
-432,7
+432,7
@@
static inline void mace_clean_rings(struct mace_data *mp)
for (i = 0; i < N_RX_RING; ++i) {
if (mp->rx_bufs[i] != 0) {
dev_kfree_skb(mp->rx_bufs[i]);
for (i = 0; i < N_RX_RING; ++i) {
if (mp->rx_bufs[i] != 0) {
dev_kfree_skb(mp->rx_bufs[i]);
- mp->rx_bufs[i] =
0
;
+ mp->rx_bufs[i] =
NULL
;
}
}
for (i = mp->tx_empty; i != mp->tx_fill; ) {
}
}
for (i = mp->tx_empty; i != mp->tx_fill; ) {
@@
-475,7
+475,7
@@
static int mace_open(struct net_device *dev)
cp->xfer_status = 0;
++cp;
}
cp->xfer_status = 0;
++cp;
}
- mp->rx_bufs[i] =
0
;
+ mp->rx_bufs[i] =
NULL
;
st_le16(&cp->command, DBDMA_STOP);
mp->rx_fill = i;
mp->rx_empty = 0;
st_le16(&cp->command, DBDMA_STOP);
mp->rx_fill = i;
mp->rx_empty = 0;
@@
-959,7
+959,7
@@
static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs)
mp->stats.rx_bytes += skb->len;
netif_rx(skb);
dev->last_rx = jiffies;
mp->stats.rx_bytes += skb->len;
netif_rx(skb);
dev->last_rx = jiffies;
- mp->rx_bufs[i] =
0
;
+ mp->rx_bufs[i] =
NULL
;
++mp->stats.rx_packets;
}
} else {
++mp->stats.rx_packets;
}
} else {