diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-05 20:19:47 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:55:27 -0400 |
commit | ddfce6bb43c6bf1c9956e7a65ce1b2e19a156bd2 (patch) | |
tree | 38e871422ccb6168ae84ca6e33e9374715c3df9b /drivers/net/hamachi.c | |
parent | 43b7c451a03fe5f615710e26e8e2a3dd70eaa5b1 (diff) |
network drivers: sparse warning fixes
Fix some of the easy warnings in network device drivers.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r-- | drivers/net/hamachi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 015ed3a4057f..ed407c85708f 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
@@ -1017,7 +1017,7 @@ static inline int hamachi_tx(struct net_device *dev) | |||
1017 | break; | 1017 | break; |
1018 | /* Free the original skb. */ | 1018 | /* Free the original skb. */ |
1019 | skb = hmp->tx_skbuff[entry]; | 1019 | skb = hmp->tx_skbuff[entry]; |
1020 | if (skb != 0) { | 1020 | if (skb) { |
1021 | pci_unmap_single(hmp->pci_dev, | 1021 | pci_unmap_single(hmp->pci_dev, |
1022 | hmp->tx_ring[entry].addr, skb->len, | 1022 | hmp->tx_ring[entry].addr, skb->len, |
1023 | PCI_DMA_TODEVICE); | 1023 | PCI_DMA_TODEVICE); |
@@ -1069,7 +1069,6 @@ static void hamachi_tx_timeout(struct net_device *dev) | |||
1069 | " resetting...\n", dev->name, (int)readw(ioaddr + TxStatus)); | 1069 | " resetting...\n", dev->name, (int)readw(ioaddr + TxStatus)); |
1070 | 1070 | ||
1071 | { | 1071 | { |
1072 | int i; | ||
1073 | printk(KERN_DEBUG " Rx ring %p: ", hmp->rx_ring); | 1072 | printk(KERN_DEBUG " Rx ring %p: ", hmp->rx_ring); |
1074 | for (i = 0; i < RX_RING_SIZE; i++) | 1073 | for (i = 0; i < RX_RING_SIZE; i++) |
1075 | printk(" %8.8x", (unsigned int)hmp->rx_ring[i].status_n_length); | 1074 | printk(" %8.8x", (unsigned int)hmp->rx_ring[i].status_n_length); |