summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-10 06:55:21 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 12:32:55 -0500
commit3ddf6befb98d5dd61466a0e0e585037f6dca352f (patch)
treeedd8447b73e81a1026c75e53862839fb43636717
parent9cac4943aa15763a2b1f13d276ae03b4cd5aa9a1 (diff)
downloadop-kernel-dev-3ddf6befb98d5dd61466a0e0e585037f6dca352f.zip
op-kernel-dev-3ddf6befb98d5dd61466a0e0e585037f6dca352f.tar.gz
iwlagn: convert remain-on-channel duration to TU
The device expects TU but we get ms, so convert. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-mac80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 073e827..05b1f0d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/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);
OpenPOWER on IntegriCloud