lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: more timeouts that reach -1

Browse Source 
with while (timeout-- > 0); timeout reaches -1 after the loop, so the tests
below are off by one. also don't do an '< 0' test on an unsigned.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roel Kluin
2009-03-04 00:11:42 -08:00
committed by David S. Miller
parent 4222474519
commit 858b9ced6e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/arm/ks8695net.c
View File

@@ -560,7 +560,7 @@ ks8695_reset(struct ks8695_priv *ksp)
msleep(1); msleep(1);
} }
if (reset_timeout == 0) { if (reset_timeout < 0) {
dev_crit(ksp->dev, dev_crit(ksp->dev,
"Timeout waiting for DMA engines to reset\n"); "Timeout waiting for DMA engines to reset\n");
/* And blithely carry on */ /* And blithely carry on */

3
drivers/net/jme.c
View File

@@ -957,13 +957,14 @@ jme_process_receive(struct jme_adapter *jme, int limit)
goto out_inc; goto out_inc;
i = atomic_read(&rxring->next_to_clean); i = atomic_read(&rxring->next_to_clean);
while (limit-- > 0) { while (limit > 0) {
rxdesc = rxring->desc; rxdesc = rxring->desc;
rxdesc += i; rxdesc += i;
if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_OWN)) || if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_OWN)) ||
!(rxdesc->descwb.desccnt & RXWBDCNT_WBCPL)) !(rxdesc->descwb.desccnt & RXWBDCNT_WBCPL))
goto out; goto out;
--limit;
desccnt = rxdesc->descwb.desccnt & RXWBDCNT_DCNT; desccnt = rxdesc->descwb.desccnt & RXWBDCNT_DCNT;

4
drivers/net/ucc_geth_mii.c
View File

@@ -107,7 +107,7 @@ int uec_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
static int uec_mdio_reset(struct mii_bus *bus) static int uec_mdio_reset(struct mii_bus *bus)
{ {
struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv; struct ucc_mii_mng __iomem *regs = (void __iomem *)bus->priv;
unsigned int timeout = PHY_INIT_TIMEOUT; int timeout = PHY_INIT_TIMEOUT;
mutex_lock(&bus->mdio_lock); mutex_lock(&bus->mdio_lock);
@@ -123,7 +123,7 @@ static int uec_mdio_reset(struct mii_bus *bus)
mutex_unlock(&bus->mdio_lock); mutex_unlock(&bus->mdio_lock);
if (timeout <= 0) { if (timeout < 0) {
printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name); printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name);
return -EBUSY; return -EBUSY;
} }