diff options
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) | |||
409 | 409 | ||
410 | /* free some skb's */ | 410 | /* free some skb's */ |
411 | for (i = 0; i < N_RX_RING; ++i) { | 411 | for (i = 0; i < N_RX_RING; ++i) { |
412 | if (mp->rx_bufs[i] != 0) { | 412 | if (mp->rx_bufs[i] != NULL) { |
413 | dev_kfree_skb(mp->rx_bufs[i]); | 413 | dev_kfree_skb(mp->rx_bufs[i]); |
414 | mp->rx_bufs[i] = NULL; | 414 | mp->rx_bufs[i] = NULL; |
415 | } | 415 | } |
@@ -441,7 +441,7 @@ static int mace_open(struct net_device *dev) | |||
441 | cp = mp->rx_cmds; | 441 | cp = mp->rx_cmds; |
442 | for (i = 0; i < N_RX_RING - 1; ++i) { | 442 | for (i = 0; i < N_RX_RING - 1; ++i) { |
443 | skb = dev_alloc_skb(RX_BUFLEN + 2); | 443 | skb = dev_alloc_skb(RX_BUFLEN + 2); |
444 | if (skb == 0) { | 444 | if (!skb) { |
445 | data = dummy_buf; | 445 | data = dummy_buf; |
446 | } else { | 446 | } else { |
447 | skb_reserve(skb, 2); /* so IP header lands on 4-byte bdry */ | 447 | 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) | |||
903 | out_le16(&cp->command, DBDMA_STOP); | 903 | out_le16(&cp->command, DBDMA_STOP); |
904 | /* got a packet, have a look at it */ | 904 | /* got a packet, have a look at it */ |
905 | skb = mp->rx_bufs[i]; | 905 | skb = mp->rx_bufs[i]; |
906 | if (skb == 0) { | 906 | if (!skb) { |
907 | ++dev->stats.rx_dropped; | 907 | ++dev->stats.rx_dropped; |
908 | } else if (nb > 8) { | 908 | } else if (nb > 8) { |
909 | data = skb->data; | 909 | data = skb->data; |
@@ -953,9 +953,9 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) | |||
953 | break; | 953 | break; |
954 | cp = mp->rx_cmds + i; | 954 | cp = mp->rx_cmds + i; |
955 | skb = mp->rx_bufs[i]; | 955 | skb = mp->rx_bufs[i]; |
956 | if (skb == 0) { | 956 | if (!skb) { |
957 | skb = dev_alloc_skb(RX_BUFLEN + 2); | 957 | skb = dev_alloc_skb(RX_BUFLEN + 2); |
958 | if (skb != 0) { | 958 | if (skb) { |
959 | skb_reserve(skb, 2); | 959 | skb_reserve(skb, 2); |
960 | mp->rx_bufs[i] = skb; | 960 | mp->rx_bufs[i] = skb; |
961 | } | 961 | } |