2015-06-15 17:33:01

by Nicholas Mc Guire

Subject: [PATCH] wireless: ipw2100: fix timeout bug - always evaluated to 0

commit: commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced
HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified
by Stanislav Yakovlev <[email protected]> that it should be 50
milliseconds thus fixed up to msecs_to_jiffies(50).

Signed-off-by: Nicholas Mc Guire <[email protected]>
---

Patch was compile tested with x86_64_defconfig + CONFIG_IPW2100=m
(with a few buildwarnings in ipw2100.c though not related to this patch)

Patch is against 4.1-rc7 (localversion-next is -next-20150615)

drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 08eb229..36818c7 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -1410,7 +1410,7 @@ static int ipw2100_power_cycle_adapter(struct ipw2100_priv *priv)
static int ipw2100_hw_phy_off(struct ipw2100_priv *priv)
{

-#define HW_PHY_OFF_LOOP_DELAY (HZ / 5000)
+#define HW_PHY_OFF_LOOP_DELAY (msecs_to_jiffies(50))

struct host_command cmd = {
.host_command = CARD_DISABLE_PHY_OFF,
--
1.7.10.4

2015-06-15 18:25:41

by Stanislav Yakovlev

Subject: Re: [PATCH] wireless: ipw2100: fix timeout bug - always evaluated to 0

On 15 June 2015 at 21:24, Nicholas Mc Guire <[email protected]> wrote:
> commit: commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced
> HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified
> by Stanislav Yakovlev <[email protected]> that it should be 50
> milliseconds thus fixed up to msecs_to_jiffies(50).
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
> ---
>
> Patch was compile tested with x86_64_defconfig + CONFIG_IPW2100=m
> (with a few buildwarnings in ipw2100.c though not related to this patch)
>
> Patch is against 4.1-rc7 (localversion-next is -next-20150615)
>
> drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>

Acked-by: Stanislav Yakovlev <[email protected]>

Stanislav.

2015-07-11 16:51:04

by Kalle Valo

Subject: Re: ipw2100: fix timeout bug - always evaluated to 0

> commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced
> HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified
> by Stanislav Yakovlev <[email protected]> that it should be 50
> milliseconds thus fixed up to msecs_to_jiffies(50).
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
> Acked-by: Stanislav Yakovlev <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo