diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sch_generic.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 3d78a4d22460..964ffa0d8815 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -49,18 +49,10 @@ struct Qdisc | |||
49 | int padded; | 49 | int padded; |
50 | struct Qdisc_ops *ops; | 50 | struct Qdisc_ops *ops; |
51 | struct qdisc_size_table *stab; | 51 | struct qdisc_size_table *stab; |
52 | struct list_head list; | ||
52 | u32 handle; | 53 | u32 handle; |
53 | u32 parent; | 54 | u32 parent; |
54 | atomic_t refcnt; | 55 | atomic_t refcnt; |
55 | unsigned long state; | ||
56 | struct sk_buff *gso_skb; | ||
57 | struct sk_buff_head q; | ||
58 | struct netdev_queue *dev_queue; | ||
59 | struct Qdisc *next_sched; | ||
60 | struct list_head list; | ||
61 | |||
62 | struct gnet_stats_basic bstats; | ||
63 | struct gnet_stats_queue qstats; | ||
64 | struct gnet_stats_rate_est rate_est; | 56 | struct gnet_stats_rate_est rate_est; |
65 | int (*reshape_fail)(struct sk_buff *skb, | 57 | int (*reshape_fail)(struct sk_buff *skb, |
66 | struct Qdisc *q); | 58 | struct Qdisc *q); |
@@ -71,6 +63,17 @@ struct Qdisc | |||
71 | * and it will live until better solution will be invented. | 63 | * and it will live until better solution will be invented. |
72 | */ | 64 | */ |
73 | struct Qdisc *__parent; | 65 | struct Qdisc *__parent; |
66 | struct netdev_queue *dev_queue; | ||
67 | struct Qdisc *next_sched; | ||
68 | |||
69 | struct sk_buff *gso_skb; | ||
70 | /* | ||
71 | * For performance sake on SMP, we put highly modified fields at the end | ||
72 | */ | ||
73 | unsigned long state; | ||
74 | struct sk_buff_head q; | ||
75 | struct gnet_stats_basic bstats; | ||
76 | struct gnet_stats_queue qstats; | ||
74 | }; | 77 | }; |
75 | 78 | ||
76 | struct Qdisc_class_ops | 79 | struct Qdisc_class_ops |