diff --git a/[refs] b/[refs]
index 0d3dee3dd271..d054fd4f83e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cac4943aa15763a2b1f13d276ae03b4cd5aa9a1
+refs/heads/master: 3ddf6befb98d5dd61466a0e0e585037f6dca352f
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 073e827c462b..05b1f0d2f387 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -957,7 +957,8 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
 
 	priv->hw_roc_channel = channel;
 	priv->hw_roc_chantype = channel_type;
-	priv->hw_roc_duration = duration;
+	/* convert from ms to TU */
+	priv->hw_roc_duration = DIV_ROUND_UP(1000 * duration, 1024);
 	priv->hw_roc_start_notified = false;
 	cancel_delayed_work(&priv->hw_roc_disable_work);