[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

Convert packet schedulers to use the netlink API. Unfortunately a gradual
conversion is not possible without breaking compilation in the middle or
adding lots of casts, so this patch converts them all in one step. The
patch has been mostly generated automatically with some minor edits to
at least allow seperate conversion of classifiers and actions.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 7 insertions, 7 deletions

diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index 0b95cf031d6e..8cd8185fa2ed 100644
--- 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;
@@ -39,11 +39,11 @@ extern int gnet_stats_finish_copy(struct gnet_dump *d);
 
 extern int gen_new_estimator(struct gnet_stats_basic *bstats,
                              struct gnet_stats_rate_est *rate_est,
-                             spinlock_t *stats_lock, struct rtattr *opt);
+                             spinlock_t *stats_lock, struct nlattr *opt);
 extern void gen_kill_estimator(struct gnet_stats_basic *bstats,
                                struct gnet_stats_rate_est *rate_est);
 extern int gen_replace_estimator(struct gnet_stats_basic *bstats,
                                  struct gnet_stats_rate_est *rate_est,
-                                 spinlock_t *stats_lock, struct rtattr *opt);
+                                 spinlock_t *stats_lock, struct nlattr *opt);
 
 #endif
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index ab61809a9616..46fb4d80c74a 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -77,7 +77,7 @@ extern int unregister_qdisc(struct Qdisc_ops *qops);
 extern struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle);
 extern struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle);
 extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r,
-                struct rtattr *tab);
+                struct nlattr *tab);
 extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
 
 extern void __qdisc_run(struct net_device *dev);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 9418ac26c986..8cacdff24594 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -66,7 +66,7 @@ struct Qdisc_class_ops
         unsigned long           (*get)(struct Qdisc *, u32 classid);
         void                    (*put)(struct Qdisc *, unsigned long);
         int                     (*change)(struct Qdisc *, u32, u32,
-                                        struct rtattr **, unsigned long *);
+                                        struct nlattr **, unsigned long *);
         int                     (*delete)(struct Qdisc *, unsigned long);
         void                    (*walk)(struct Qdisc *, struct qdisc_walker * arg);
 
@@ -95,10 +95,10 @@ struct Qdisc_ops
         int                     (*requeue)(struct sk_buff *, struct Qdisc *);
         unsigned int            (*drop)(struct Qdisc *);
 
-        int                     (*init)(struct Qdisc *, struct rtattr *arg);
+        int                     (*init)(struct Qdisc *, struct nlattr *arg);
         void                    (*reset)(struct Qdisc *);
         void                    (*destroy)(struct Qdisc *);
-        int                     (*change)(struct Qdisc *, struct rtattr *arg);
+        int                     (*change)(struct Qdisc *, struct nlattr *arg);
 
         int                     (*dump)(struct Qdisc *, struct sk_buff *);
         int                     (*dump_stats)(struct Qdisc *, struct gnet_dump *);