| Message ID | 1434389075-4693-1-git-send-email-hofrat@osadl.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
On 15 June 2015 at 21:24, Nicholas Mc Guire <hofrat@osadl.org> 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 <stas.yakovlev@gmail.com> that it should be 50 > milliseconds thus fixed up to msecs_to_jiffies(50). > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > --- > > 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 <stas.yakovlev@gmail.com> Stanislav. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced > HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified > by Stanislav Yakovlev <stas.yakovlev@gmail.com> that it should be 50 > milliseconds thus fixed up to msecs_to_jiffies(50). > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > Acked-by: Stanislav Yakovlev <stas.yakovlev@gmail.com> Thanks, applied to wireless-drivers-next.git. Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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,
commit: commit 2c86c275015c ("Add ipw2100 wireless driver.") introduced HW_PHY_OFF_LOOP_DELAY (HZ / 5000) which always evaluated to 0. Clarified by Stanislav Yakovlev <stas.yakovlev@gmail.com> that it should be 50 milliseconds thus fixed up to msecs_to_jiffies(50). Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> --- 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(-)