Re: [PATCH] jiffies_round -> jiffies_round_relative conversion - ipw2100/ipw2200
On Mon, 2007-10-15 at 00:38 -0500, Anton Blanchard wrote: > > When rounding a relative timeout we need to use > round_jiffies_relative(). ACK. John, please apply this patch to wireless-2.6. Thanks. -yi - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] jiffies_round - jiffies_round_relative conversion - ipw2100/ipw2200
On Mon, 2007-10-15 at 00:38 -0500, Anton Blanchard wrote: When rounding a relative timeout we need to use round_jiffies_relative(). ACK. John, please apply this patch to wireless-2.6. Thanks. -yi - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] jiffies_round -> jiffies_round_relative conversion - ipw2100/ipw2200
On Mon, 15 Oct 2007 00:38:01 -0500 Anton Blanchard <[EMAIL PROTECTED]> wrote: > > When rounding a relative timeout we need to use > round_jiffies_relative(). Acked-by: Arjan van de Ven <[EMAIL PROTECTED]> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] jiffies_round - jiffies_round_relative conversion - ipw2100/ipw2200
On Mon, 15 Oct 2007 00:38:01 -0500 Anton Blanchard [EMAIL PROTECTED] wrote: When rounding a relative timeout we need to use round_jiffies_relative(). Acked-by: Arjan van de Ven [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] jiffies_round -> jiffies_round_relative conversion - ipw2100/ipw2200
When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: Anton Blanchard <[EMAIL PROTECTED]>
---
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2d46a16..739d060 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1769,7 +1769,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int
deferred)
if (priv->stop_rf_kill) {
priv->stop_rf_kill = 0;
queue_delayed_work(priv->workqueue, >rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
}
deferred = 1;
@@ -2102,7 +2102,8 @@ static void isr_indicate_rf_kill(struct ipw2100_priv
*priv, u32 status)
/* Make sure the RF Kill check timer is running */
priv->stop_rf_kill = 0;
cancel_delayed_work(>rf_kill);
- queue_delayed_work(priv->workqueue, >rf_kill, round_jiffies(HZ));
+ queue_delayed_work(priv->workqueue, >rf_kill,
+ round_jiffies_relative(HZ));
}
static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
@@ -4237,7 +4238,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv,
int disable_radio)
priv->stop_rf_kill = 0;
cancel_delayed_work(>rf_kill);
queue_delayed_work(priv->workqueue, >rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
} else
schedule_reset(priv);
}
@@ -5975,7 +5976,7 @@ static void ipw2100_rf_kill(struct work_struct *work)
IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
if (!priv->stop_rf_kill)
queue_delayed_work(priv->workqueue, >rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
goto exit_unlock;
}
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index feb8fcb..88b0f81 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1753,7 +1753,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int
disable_radio)
/* Make sure the RF_KILL check timer is running */
cancel_delayed_work(>rf_kill);
queue_delayed_work(priv->workqueue, >rf_kill,
- round_jiffies(2 * HZ));
+ round_jiffies_relative(2 * HZ));
} else
queue_work(priv->workqueue, >up);
}
@@ -4364,7 +4364,7 @@ static void handle_scan_event(struct ipw_priv *priv)
if (!priv->user_requested_scan) {
if (!delayed_work_pending(>scan_event))
queue_delayed_work(priv->workqueue, >scan_event,
-round_jiffies(msecs_to_jiffies(4000)));
+
round_jiffies_relative(msecs_to_jiffies(4000)));
} else {
union iwreq_data wrqu;
@@ -4728,7 +4728,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
&& priv->status & STATUS_ASSOCIATED)
queue_delayed_work(priv->workqueue,
>request_scan,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
/* Send an empty event to user space.
* We don't send the received data on the event because
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] jiffies_round - jiffies_round_relative conversion - ipw2100/ipw2200
When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: Anton Blanchard [EMAIL PROTECTED]
---
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 2d46a16..739d060 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1769,7 +1769,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int
deferred)
if (priv-stop_rf_kill) {
priv-stop_rf_kill = 0;
queue_delayed_work(priv-workqueue, priv-rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
}
deferred = 1;
@@ -2102,7 +2102,8 @@ static void isr_indicate_rf_kill(struct ipw2100_priv
*priv, u32 status)
/* Make sure the RF Kill check timer is running */
priv-stop_rf_kill = 0;
cancel_delayed_work(priv-rf_kill);
- queue_delayed_work(priv-workqueue, priv-rf_kill, round_jiffies(HZ));
+ queue_delayed_work(priv-workqueue, priv-rf_kill,
+ round_jiffies_relative(HZ));
}
static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
@@ -4237,7 +4238,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv,
int disable_radio)
priv-stop_rf_kill = 0;
cancel_delayed_work(priv-rf_kill);
queue_delayed_work(priv-workqueue, priv-rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
} else
schedule_reset(priv);
}
@@ -5975,7 +5976,7 @@ static void ipw2100_rf_kill(struct work_struct *work)
IPW_DEBUG_RF_KILL(RF Kill active, rescheduling GPIO check\n);
if (!priv-stop_rf_kill)
queue_delayed_work(priv-workqueue, priv-rf_kill,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
goto exit_unlock;
}
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index feb8fcb..88b0f81 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1753,7 +1753,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int
disable_radio)
/* Make sure the RF_KILL check timer is running */
cancel_delayed_work(priv-rf_kill);
queue_delayed_work(priv-workqueue, priv-rf_kill,
- round_jiffies(2 * HZ));
+ round_jiffies_relative(2 * HZ));
} else
queue_work(priv-workqueue, priv-up);
}
@@ -4364,7 +4364,7 @@ static void handle_scan_event(struct ipw_priv *priv)
if (!priv-user_requested_scan) {
if (!delayed_work_pending(priv-scan_event))
queue_delayed_work(priv-workqueue, priv-scan_event,
-round_jiffies(msecs_to_jiffies(4000)));
+
round_jiffies_relative(msecs_to_jiffies(4000)));
} else {
union iwreq_data wrqu;
@@ -4728,7 +4728,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
priv-status STATUS_ASSOCIATED)
queue_delayed_work(priv-workqueue,
priv-request_scan,
- round_jiffies(HZ));
+ round_jiffies_relative(HZ));
/* Send an empty event to user space.
* We don't send the received data on the event because
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
