exofs: Fix "add bdi backing to mount session" fall out

[safe/jmp/linux-2.6] / net / mac80211 / rc80211_pid_algo.c

diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index 29bc4c5..aeda654 100644 (file)
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -13,6 +13,7 @@
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/debugfs.h>
+#include <linux/slab.h>
 #include <net/mac80211.h>
 #include "rate.h"
 #include "mesh.h"
@@ -157,9 +158,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 +251,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);
 }