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: (37 commits)
  forcedeth bug fix: realtek phy
  forcedeth bug fix: vitesse phy
  forcedeth bug fix: cicada phy
  atl1: reorder atl1_main functions
  atl1: fix excessively indented code
  atl1: cleanup atl1_main
  atl1: header file cleanup
  atl1: remove irq_sem
  cdc-subset to support new vendor/product ID
  8139cp: implement the missing dev->tx_timeout
  myri10ge: Remove nonsensical limit in the tx done routine
  gianfar: kill unused header
  EP93XX_ETH must select MII
  macb: Add multicast capability
  macb: Use generic PHY layer
  s390: add barriers to qeth driver
  s390: scatter-gather for inbound traffic in qeth driver
  eHEA: Introducing support vor DLPAR memory add
  Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
  [PATCH] softmac: Fix ESSID problem
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index d51daf87450f..072ede71e575 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1768,7 +1768,8 @@ 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, HZ);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           round_jiffies(HZ));
                 }
 
                 deferred = 1;
@@ -2098,7 +2099,7 @@ 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, HZ);
+        queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));
 }
 
 static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
@@ -4233,7 +4234,8 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio)
                         /* 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, HZ);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           round_jiffies(HZ));
                 } else
                         schedule_reset(priv);
         }
@@ -5969,7 +5971,8 @@ static void ipw2100_rf_kill(struct work_struct *work)
         if (rf_kill_active(priv)) {
                 IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");
                 if (!priv->stop_rf_kill)
-                        queue_delayed_work(priv->workqueue, &priv->rf_kill, HZ);
+                        queue_delayed_work(priv->workqueue, &priv->rf_kill,
+                                           round_jiffies(HZ));
                 goto exit_unlock;
         }