diff options
Diffstat (limited to 'net/sched/sch_prio.c')
-rw-r--r-- | net/sched/sch_prio.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 3651da3e2802..ea65a87ec22c 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
@@ -93,33 +93,6 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
93 | return ret; | 93 | return ret; |
94 | } | 94 | } |
95 | 95 | ||
96 | |||
97 | static int | ||
98 | prio_requeue(struct sk_buff *skb, struct Qdisc* sch) | ||
99 | { | ||
100 | struct Qdisc *qdisc; | ||
101 | int ret; | ||
102 | |||
103 | qdisc = prio_classify(skb, sch, &ret); | ||
104 | #ifdef CONFIG_NET_CLS_ACT | ||
105 | if (qdisc == NULL) { | ||
106 | if (ret & __NET_XMIT_BYPASS) | ||
107 | sch->qstats.drops++; | ||
108 | kfree_skb(skb); | ||
109 | return ret; | ||
110 | } | ||
111 | #endif | ||
112 | |||
113 | if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) { | ||
114 | sch->q.qlen++; | ||
115 | sch->qstats.requeues++; | ||
116 | return NET_XMIT_SUCCESS; | ||
117 | } | ||
118 | if (net_xmit_drop_count(ret)) | ||
119 | sch->qstats.drops++; | ||
120 | return ret; | ||
121 | } | ||
122 | |||
123 | static struct sk_buff *prio_peek(struct Qdisc *sch) | 96 | static struct sk_buff *prio_peek(struct Qdisc *sch) |
124 | { | 97 | { |
125 | struct prio_sched_data *q = qdisc_priv(sch); | 98 | struct prio_sched_data *q = qdisc_priv(sch); |
@@ -435,7 +408,6 @@ static struct Qdisc_ops prio_qdisc_ops __read_mostly = { | |||
435 | .enqueue = prio_enqueue, | 408 | .enqueue = prio_enqueue, |
436 | .dequeue = prio_dequeue, | 409 | .dequeue = prio_dequeue, |
437 | .peek = prio_peek, | 410 | .peek = prio_peek, |
438 | .requeue = prio_requeue, | ||
439 | .drop = prio_drop, | 411 | .drop = prio_drop, |
440 | .init = prio_init, | 412 | .init = prio_init, |
441 | .reset = prio_reset, | 413 | .reset = prio_reset, |