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

Commit be84e3d6 authored by Anton Blanchard's avatar Anton Blanchard Committed by John W. Linville
Browse files

[PATCH] ipw2100/ipw2200: jiffies_round -> jiffies_round_relative 



When rounding a relative timeout we need to use round_jiffies_relative().

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c9927c2b

drivers/net/wireless/ipw2100.c

+6 −5
Original line number Diff line number Diff line
@@ -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;
@@ -2086,7 +2086,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 send_scan_event(void *data)
@@ -2123,7 +2124,7 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status) 
		if (!delayed_work_pending(&priv->scan_event_later))

			queue_delayed_work(priv->workqueue,

					&priv->scan_event_later,

					round_jiffies(msecs_to_jiffies(4000)));

					round_jiffies_relative(msecs_to_jiffies(4000)));

	} else {

		priv->user_requested_scan = 0;

		cancel_delayed_work(&priv->scan_event_later);
@@ -4242,7 +4243,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);

	}
@@ -5981,7 +5982,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;

	}

drivers/net/wireless/ipw2200.c

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