Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 858b9ced authored by Roel Kluin's avatar Roel Kluin Committed by David S. Miller
Browse files

net: more timeouts that reach -1 



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: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42224745

drivers/net/arm/ks8695net.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ ks8695_reset(struct ks8695_priv *ksp) 
		msleep(1);

	}



	if (reset_timeout == 0) {

	if (reset_timeout < 0) {

		dev_crit(ksp->dev,

			 "Timeout waiting for DMA engines to reset\n");

		/* And blithely carry on */

drivers/net/jme.c

+2 −1
Original line number Diff line number Diff line
@@ -957,13 +957,14 @@ jme_process_receive(struct jme_adapter *jme, int limit) 
		goto out_inc;



	i = atomic_read(&rxring->next_to_clean);

	while (limit-- > 0) {

	while (limit > 0) {

		rxdesc = rxring->desc;

		rxdesc += i;



		if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_OWN)) ||

		!(rxdesc->descwb.desccnt & RXWBDCNT_WBCPL))

			goto out;

		--limit;



		desccnt = rxdesc->descwb.desccnt & RXWBDCNT_DCNT;

drivers/net/ucc_geth_mii.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{

	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);
@@ -123,7 +123,7 @@ static int uec_mdio_reset(struct mii_bus *bus) 


	mutex_unlock(&bus->mdio_lock);



	if (timeout <= 0) {

	if (timeout < 0) {

		printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name);

		return -EBUSY;

	}