Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (22 commits)
  Fix ethernet multicast for ucc_geth.
  netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes.
  FEC - fast ethernet controller for mpc52xx
  ehea: add kexec support
  e1000e: Remove legacy jumbo frame receive code
  e1000e: Re-enable SECRC - crc stripping
  e1000e: Fix PBA calculation for jumbo frame packets
  e1000e: Fix jumbo frame receive code.
  drivers/net/irda/au1k_ir: fix obvious irq handler bugs
  ipg: Kconfig whitepaces/tab damages
  ipg: missing Kconfig dependency
  r8169: remove poll_locked logic
  r8169: napi config
  [PATCH] iwl3945: fix direct scan problem
  [PATCH] iwl3945: cancel scan on rxon command
  [PATCH] iwl4965: fix scan problem
  [PATCH] iwl4965: fix driver hang related to hardware scan
  [PATCH] iwlwifi: fix sending probe request in iwl 4965
  [PATCH] rtl8187: Allow multicast frames
  [PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index e3c828401b9a..54f44e5473c0 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