diff options
Diffstat (limited to 'include/net/sch_generic.h')
-rw-r--r-- | include/net/sch_generic.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 64ae1ba9f554..f8c47429044a 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -53,7 +53,6 @@ struct Qdisc | |||
53 | atomic_t refcnt; | 53 | atomic_t refcnt; |
54 | unsigned long state; | 54 | unsigned long state; |
55 | struct sk_buff *gso_skb; | 55 | struct sk_buff *gso_skb; |
56 | struct sk_buff_head requeue; | ||
57 | struct sk_buff_head q; | 56 | struct sk_buff_head q; |
58 | struct netdev_queue *dev_queue; | 57 | struct netdev_queue *dev_queue; |
59 | struct Qdisc *next_sched; | 58 | struct Qdisc *next_sched; |
@@ -112,7 +111,6 @@ struct Qdisc_ops | |||
112 | int (*enqueue)(struct sk_buff *, struct Qdisc *); | 111 | int (*enqueue)(struct sk_buff *, struct Qdisc *); |
113 | struct sk_buff * (*dequeue)(struct Qdisc *); | 112 | struct sk_buff * (*dequeue)(struct Qdisc *); |
114 | struct sk_buff * (*peek)(struct Qdisc *); | 113 | struct sk_buff * (*peek)(struct Qdisc *); |
115 | int (*requeue)(struct sk_buff *, struct Qdisc *); | ||
116 | unsigned int (*drop)(struct Qdisc *); | 114 | unsigned int (*drop)(struct Qdisc *); |
117 | 115 | ||
118 | int (*init)(struct Qdisc *, struct nlattr *arg); | 116 | int (*init)(struct Qdisc *, struct nlattr *arg); |
@@ -467,21 +465,6 @@ static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch) | |||
467 | return skb; | 465 | return skb; |
468 | } | 466 | } |
469 | 467 | ||
470 | static inline int __qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch, | ||
471 | struct sk_buff_head *list) | ||
472 | { | ||
473 | __skb_queue_head(list, skb); | ||
474 | sch->qstats.backlog += qdisc_pkt_len(skb); | ||
475 | sch->qstats.requeues++; | ||
476 | |||
477 | return NET_XMIT_SUCCESS; | ||
478 | } | ||
479 | |||
480 | static inline int qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch) | ||
481 | { | ||
482 | return __qdisc_requeue(skb, sch, &sch->q); | ||
483 | } | ||
484 | |||
485 | static inline void __qdisc_reset_queue(struct Qdisc *sch, | 468 | static inline void __qdisc_reset_queue(struct Qdisc *sch, |
486 | struct sk_buff_head *list) | 469 | struct sk_buff_head *list) |
487 | { | 470 | { |