- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / net / core / gen_estimator.c

diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
index daadbcc..57abe82 100644 (file)
--- a/net/core/gen_estimator.c
+++ b/net/core/gen_estimator.c
@@ -135,7 +135,7 @@ skip:
        }
 
        if (!list_empty(&elist[idx].list))
-               mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+               mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
        rcu_read_unlock();
 }
 
@@ -159,13 +159,13 @@ skip:
 int gen_new_estimator(struct gnet_stats_basic *bstats,
                      struct gnet_stats_rate_est *rate_est,
                      spinlock_t *stats_lock,
-                     struct rtattr *opt)
+                     struct nlattr *opt)
 {
        struct gen_estimator *est;
-       struct gnet_estimator *parm = RTA_DATA(opt);
+       struct gnet_estimator *parm = nla_data(opt);
        int idx;
 
-       if (RTA_PAYLOAD(opt) < sizeof(*parm))
+       if (nla_len(opt) < sizeof(*parm))
                return -EINVAL;
 
        if (parm->interval < -2 || parm->interval > 3)
@@ -191,7 +191,7 @@ int gen_new_estimator(struct gnet_stats_basic *bstats,
        }
 
        if (list_empty(&elist[idx].list))
-               mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+               mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
 
        list_add_rcu(&est->list, &elist[idx].list);
        return 0;
@@ -241,7 +241,7 @@ void gen_kill_estimator(struct gnet_stats_basic *bstats,
 }
 
 /**
- * gen_replace_estimator - replace rate estimator configruation
+ * gen_replace_estimator - replace rate estimator configuration
  * @bstats: basic statistics
  * @rate_est: rate estimator statistics
  * @stats_lock: statistics lock
@@ -252,13 +252,12 @@ void gen_kill_estimator(struct gnet_stats_basic *bstats,
  *
  * Returns 0 on success or a negative error code.
  */
-int
-gen_replace_estimator(struct gnet_stats_basic *bstats,
-       struct gnet_stats_rate_est *rate_est, spinlock_t *stats_lock,
-       struct rtattr *opt)
+int gen_replace_estimator(struct gnet_stats_basic *bstats,
+                         struct gnet_stats_rate_est *rate_est,
+                         spinlock_t *stats_lock, struct nlattr *opt)
 {
-    gen_kill_estimator(bstats, rate_est);
-    return gen_new_estimator(bstats, rate_est, stats_lock, opt);
+       gen_kill_estimator(bstats, rate_est);
+       return gen_new_estimator(bstats, rate_est, stats_lock, opt);
 }