On Wed, Oct 23, 2002 at 03:06:03PM -0400, Donald Becker wrote:
> > A fix for the warning is attached, please apply.
>
> You have identified a problem, but this is not the correct fix.
Ok, as per your suggestions. Fixes a cosmetic bug too, and also adds a cast
to quiet the gcc warning regarding set_bit.
--- linux-2.5.44/drivers/net/sis900.c~orig Wed Oct 23 19:50:40 2002
+++ linux-2.5.44/drivers/net/sis900.c Wed Oct 23 21:11:30 2002
@@ -387,7 +387,7 @@
i = pci_set_dma_mask(pci_dev, SIS900_DMA_MASK);
if(i){
- printk(KERN_ERR "sis900.c: architecture does not support"
+ printk(KERN_ERR "sis900.c: architecture does not support "
"32bit PCI busmaster DMA\n");
return i;
}
@@ -974,7 +974,7 @@
if (sis900_debug > 2) {
printk(KERN_INFO "%s: Receive Filter Addrss[%d]=%x\n",
- net_dev->name, i, inl(ioaddr + rfdr));
+ net_dev->name, i, (int)inl(ioaddr + rfdr));
}
}
@@ -1012,7 +1012,7 @@
outl(sis_priv->tx_ring_dma, ioaddr + txdp);
if (sis900_debug > 2)
printk(KERN_INFO "%s: TX descriptor register loaded with: %8.8x\n",
- net_dev->name, inl(ioaddr + txdp));
+ net_dev->name, (int)inl(ioaddr + txdp));
}
/**
@@ -1066,7 +1066,7 @@
outl(sis_priv->rx_ring_dma, ioaddr + rxdp);
if (sis900_debug > 2)
printk(KERN_INFO "%s: RX descriptor register loaded with: %8.8x\n",
- net_dev->name, inl(ioaddr + rxdp));
+ net_dev->name, (int)inl(ioaddr + rxdp));
}
/**
@@ -1409,7 +1409,7 @@
int i;
printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n",
- net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
+ net_dev->name, (int)inl(ioaddr + cr), (int)inl(ioaddr + isr));
/* Disable interrupts by clearing the interrupt mask. */
outl(0x0000, ioaddr + imr);
@@ -1571,7 +1571,7 @@
if (sis900_debug > 3)
printk(KERN_INFO "%s: exiting interrupt, "
"interrupt status = 0x%#8.8x.\n",
- net_dev->name, inl(ioaddr + isr));
+ net_dev->name, (int)inl(ioaddr + isr));
spin_unlock (&sis_priv->lock);
return;
@@ -2091,7 +2091,7 @@
for (i = 0, mclist = net_dev->mc_list; mclist && i < net_dev->mc_count;
i++, mclist = mclist->next)
set_bit(sis900_compute_hashtable_index(mclist->dmi_addr, revision),
- mc_filter);
+ (unsigned long *)mc_filter);
}
/* update Multicast Hash Table in Receive Filter */
--
http://www.PowerDNS.com Versatile DNS Software & Services
http://lartc.org Linux Advanced Routing & Traffic Control HOWTO
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
