* [PATCH] usbnet: test off by one
@ 2009-12-27 21:22 Roel Kluin
[not found] ` <4B37D000.6070009-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2010-01-04 5:43 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Roel Kluin @ 2009-12-27 21:22 UTC (permalink / raw)
To: Petko Manolov, linux-usb, netdev, Andrew Morton, LKML
With `while (i++ < MII_TIMEOUT)' i reaches MII_TIMEOUT + 1 after the loop
This is probably unlikely a problem in practice.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
drivers/net/usb/rtl8150.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index f14d225..fd19db0 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
get_registers(dev, PHYCNT, 1, data);
} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
- if (i < MII_TIMEOUT) {
+ if (i <= MII_TIMEOUT) {
get_registers(dev, PHYDAT, 2, data);
*reg = data[0] | (data[1] << 8);
return 0;
@@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
get_registers(dev, PHYCNT, 1, data);
} while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
- if (i < MII_TIMEOUT)
+ if (i <= MII_TIMEOUT)
return 0;
else
return 1;
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <4B37D000.6070009-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] usbnet: test off by one
[not found] ` <4B37D000.6070009-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2009-12-29 13:13 ` Petko Manolov
0 siblings, 0 replies; 3+ messages in thread
From: Petko Manolov @ 2009-12-29 13:13 UTC (permalink / raw)
To: Roel Kluin
Cc: Petko Manolov, linux-usb-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Andrew Morton, LKML
Hey Roel,
MII_TIMEOUT is a number i made up myself, reasonably small so the driver
won't sit there forever, but higher than 2. While testing the gadget i
discovered that reading MII registers sometimes require more than one
attempt.
Technically you're right. In practice it doesn't matter much. Hitting
the boundary condition mean things are already out of hand.
Petko
On Sun, 27 Dec 2009, Roel Kluin wrote:
> With `while (i++ < MII_TIMEOUT)' i reaches MII_TIMEOUT + 1 after the loop
> This is probably unlikely a problem in practice.
>
> Signed-off-by: Roel Kluin <roel.kluin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> drivers/net/usb/rtl8150.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
> index f14d225..fd19db0 100644
> --- a/drivers/net/usb/rtl8150.c
> +++ b/drivers/net/usb/rtl8150.c
> @@ -270,7 +270,7 @@ static int read_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 * reg)
> get_registers(dev, PHYCNT, 1, data);
> } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
>
> - if (i < MII_TIMEOUT) {
> + if (i <= MII_TIMEOUT) {
> get_registers(dev, PHYDAT, 2, data);
> *reg = data[0] | (data[1] << 8);
> return 0;
> @@ -295,7 +295,7 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)
> get_registers(dev, PHYCNT, 1, data);
> } while ((data[0] & PHY_GO) && (i++ < MII_TIMEOUT));
>
> - if (i < MII_TIMEOUT)
> + if (i <= MII_TIMEOUT)
> return 0;
> else
> return 1;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] usbnet: test off by one
2009-12-27 21:22 [PATCH] usbnet: test off by one Roel Kluin
[not found] ` <4B37D000.6070009-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2010-01-04 5:43 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-01-04 5:43 UTC (permalink / raw)
To: roel.kluin; +Cc: petkan, linux-usb, netdev, akpm, linux-kernel
From: Roel Kluin <roel.kluin@gmail.com>
Date: Sun, 27 Dec 2009 22:22:08 +0100
> With `while (i++ < MII_TIMEOUT)' i reaches MII_TIMEOUT + 1 after the loop
> This is probably unlikely a problem in practice.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-04 5:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-27 21:22 [PATCH] usbnet: test off by one Roel Kluin
[not found] ` <4B37D000.6070009-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2009-12-29 13:13 ` Petko Manolov
2010-01-04 5:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).