diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/mace.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
| download | blackbird-op-linux-bd45ac0c5daae35e7c71138172e63df5cf644cf6.tar.gz blackbird-op-linux-bd45ac0c5daae35e7c71138172e63df5cf644cf6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/mace.c')
| -rw-r--r-- | drivers/net/mace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 95ebe72f320f..451acdca2a21 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c @@ -409,7 +409,7 @@ static inline void mace_clean_rings(struct mace_data *mp) /* free some skb's */ for (i = 0; i < N_RX_RING; ++i) { - if (mp->rx_bufs[i] != 0) { + if (mp->rx_bufs[i] != NULL) { dev_kfree_skb(mp->rx_bufs[i]); mp->rx_bufs[i] = NULL; } @@ -441,7 +441,7 @@ static int mace_open(struct net_device *dev) cp = mp->rx_cmds; for (i = 0; i < N_RX_RING - 1; ++i) { skb = dev_alloc_skb(RX_BUFLEN + 2); - if (skb == 0) { + if (!skb) { data = dummy_buf; } else { skb_reserve(skb, 2); /* so IP header lands on 4-byte bdry */ @@ -903,7 +903,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) out_le16(&cp->command, DBDMA_STOP); /* got a packet, have a look at it */ skb = mp->rx_bufs[i]; - if (skb == 0) { + if (!skb) { ++dev->stats.rx_dropped; } else if (nb > 8) { data = skb->data; @@ -953,9 +953,9 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) break; cp = mp->rx_cmds + i; skb = mp->rx_bufs[i]; - if (skb == 0) { + if (!skb) { skb = dev_alloc_skb(RX_BUFLEN + 2); - if (skb != 0) { + if (skb) { skb_reserve(skb, 2); mp->rx_bufs[i] = skb; } |
