diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/gen_stats.h | 6 | ||||
-rw-r--r-- | include/net/pkt_sched.h | 2 | ||||
-rw-r--r-- | include/net/sch_generic.h | 6 |
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 | |||
10 | { | 10 | { |
11 | spinlock_t * lock; | 11 | spinlock_t * lock; |
12 | struct sk_buff * skb; | 12 | struct sk_buff * skb; |
13 | struct rtattr * tail; | 13 | struct nlattr * tail; |
14 | 14 | ||
15 | /* Backward compatability */ | 15 | /* Backward compatability */ |
16 | int compat_tc_stats; | 16 | int compat_tc_stats; |
@@ -39,11 +39,11 @@ extern int gnet_stats_finish_copy(struct gnet_dump *d); | |||
39 | 39 | ||
40 | extern int gen_new_estimator(struct gnet_stats_basic *bstats, | 40 | extern int gen_new_estimator(struct gnet_stats_basic *bstats, |
41 | struct gnet_stats_rate_est *rate_est, | 41 | struct gnet_stats_rate_est *rate_est, |
42 | spinlock_t *stats_lock, struct rtattr *opt); | 42 | spinlock_t *stats_lock, struct nlattr *opt); |
43 | extern void gen_kill_estimator(struct gnet_stats_basic *bstats, | 43 | extern void gen_kill_estimator(struct gnet_stats_basic *bstats, |
44 | struct gnet_stats_rate_est *rate_est); | 44 | struct gnet_stats_rate_est *rate_est); |
45 | extern int gen_replace_estimator(struct gnet_stats_basic *bstats, | 45 | extern int gen_replace_estimator(struct gnet_stats_basic *bstats, |
46 | struct gnet_stats_rate_est *rate_est, | 46 | struct gnet_stats_rate_est *rate_est, |
47 | spinlock_t *stats_lock, struct rtattr *opt); | 47 | spinlock_t *stats_lock, struct nlattr *opt); |
48 | 48 | ||
49 | #endif | 49 | #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); | |||
77 | extern struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle); | 77 | extern struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle); |
78 | extern struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle); | 78 | extern struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle); |
79 | extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, | 79 | extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, |
80 | struct rtattr *tab); | 80 | struct nlattr *tab); |
81 | extern void qdisc_put_rtab(struct qdisc_rate_table *tab); | 81 | extern void qdisc_put_rtab(struct qdisc_rate_table *tab); |
82 | 82 | ||
83 | extern void __qdisc_run(struct net_device *dev); | 83 | 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 | |||
66 | unsigned long (*get)(struct Qdisc *, u32 classid); | 66 | unsigned long (*get)(struct Qdisc *, u32 classid); |
67 | void (*put)(struct Qdisc *, unsigned long); | 67 | void (*put)(struct Qdisc *, unsigned long); |
68 | int (*change)(struct Qdisc *, u32, u32, | 68 | int (*change)(struct Qdisc *, u32, u32, |
69 | struct rtattr **, unsigned long *); | 69 | struct nlattr **, unsigned long *); |
70 | int (*delete)(struct Qdisc *, unsigned long); | 70 | int (*delete)(struct Qdisc *, unsigned long); |
71 | void (*walk)(struct Qdisc *, struct qdisc_walker * arg); | 71 | void (*walk)(struct Qdisc *, struct qdisc_walker * arg); |
72 | 72 | ||
@@ -95,10 +95,10 @@ struct Qdisc_ops | |||
95 | int (*requeue)(struct sk_buff *, struct Qdisc *); | 95 | int (*requeue)(struct sk_buff *, struct Qdisc *); |
96 | unsigned int (*drop)(struct Qdisc *); | 96 | unsigned int (*drop)(struct Qdisc *); |
97 | 97 | ||
98 | int (*init)(struct Qdisc *, struct rtattr *arg); | 98 | int (*init)(struct Qdisc *, struct nlattr *arg); |
99 | void (*reset)(struct Qdisc *); | 99 | void (*reset)(struct Qdisc *); |
100 | void (*destroy)(struct Qdisc *); | 100 | void (*destroy)(struct Qdisc *); |
101 | int (*change)(struct Qdisc *, struct rtattr *arg); | 101 | int (*change)(struct Qdisc *, struct nlattr *arg); |
102 | 102 | ||
103 | int (*dump)(struct Qdisc *, struct sk_buff *); | 103 | int (*dump)(struct Qdisc *, struct sk_buff *); |
104 | int (*dump_stats)(struct Qdisc *, struct gnet_dump *); | 104 | int (*dump_stats)(struct Qdisc *, struct gnet_dump *); |