tty_port: handle the nonblocking open of a dead port corner case

[safe/jmp/linux-2.6] / include / net / gen_stats.h

diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index 0b95cf0..c148855 100644 (file)
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -10,7 +10,7 @@ struct gnet_dump
 {
        spinlock_t *      lock;
        struct sk_buff *  skb;
-       struct rtattr *   tail;
+       struct nlattr *   tail;
 
        /* Backward compatability */
        int               compat_tc_stats;
@@ -28,7 +28,7 @@ extern int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
                                        spinlock_t *lock, struct gnet_dump *d);
 
 extern int gnet_stats_copy_basic(struct gnet_dump *d,
-                                struct gnet_stats_basic *b);
+                                struct gnet_stats_basic_packed *b);
 extern int gnet_stats_copy_rate_est(struct gnet_dump *d,
                                    struct gnet_stats_rate_est *r);
 extern int gnet_stats_copy_queue(struct gnet_dump *d,
@@ -37,13 +37,14 @@ extern int gnet_stats_copy_app(struct gnet_dump *d, void *st, int len);
 
 extern int gnet_stats_finish_copy(struct gnet_dump *d);
 
-extern int gen_new_estimator(struct gnet_stats_basic *bstats,
+extern int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
                             struct gnet_stats_rate_est *rate_est,
-                            spinlock_t *stats_lock, struct rtattr *opt);
-extern void gen_kill_estimator(struct gnet_stats_basic *bstats,
+                            spinlock_t *stats_lock, struct nlattr *opt);
+extern void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
                               struct gnet_stats_rate_est *rate_est);
-extern int gen_replace_estimator(struct gnet_stats_basic *bstats,
+extern int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
                                 struct gnet_stats_rate_est *rate_est,
-                                spinlock_t *stats_lock, struct rtattr *opt);
-
+                                spinlock_t *stats_lock, struct nlattr *opt);
+extern bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
+                                const struct gnet_stats_rate_est *rate_est);
 #endif