diff options
| author |   Bob Copeland <me@bobcopeland.com> | 2010-01-16 14:36:53 -0500 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-01-19 16:25:15 -0500 |
| commit | 8e9310c1790566ea2de2e8b6e1c04bacbbee648c (patch) | |
| tree | eb997c22b6521da1062f6d713fd74b99f0381bda /net/mac80211/rc80211_pid_algo.c | |
| parent | iwlwifi: update copyright year to 2010 (diff) | |
| download | linux-dev-8e9310c1790566ea2de2e8b6e1c04bacbbee648c.tar.xz linux-dev-8e9310c1790566ea2de2e8b6e1c04bacbbee648c.zip | |
mac80211: pid: replace open-coded msecs_to_jiffies
Code directly scaling by HZ and rounding can be more efficiently
and clearly performed with msecs_to_jiffies.
Signed-off-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rc80211_pid_algo.c')
| -rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index 29bc4c516238..2652a374974e 100644 --- a/net/mac80211/rc80211_pid_algo.c +++ b/net/mac80211/rc80211_pid_algo.c @@ -157,9 +157,7 @@ static void rate_control_pid_sample(struct rc_pid_info *pinfo, /* In case nothing happened during the previous control interval, turn * the sharpening factor on. */ - period = (HZ * pinfo->sampling_period + 500) / 1000; - if (!period) - period = 1; + period = msecs_to_jiffies(pinfo->sampling_period); if (jiffies - spinfo->last_sample > 2 * period) spinfo->sharp_cnt = pinfo->sharpen_duration; @@ -252,9 +250,7 @@ static void rate_control_pid_tx_status(void *priv, struct ieee80211_supported_ba } /* Update PID controller state. */ - period = (HZ * pinfo->sampling_period + 500) / 1000; - if (!period) - period = 1; + period = msecs_to_jiffies(pinfo->sampling_period); if (time_after(jiffies, spinfo->last_sample + period)) rate_control_pid_sample(pinfo, sband, sta, spinfo); } |