diff options
Diffstat (limited to 'net/sched/sch_gred.c')
-rw-r--r-- | net/sched/sch_gred.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index c1ad6b8de105..40408d595c08 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c | |||
@@ -240,26 +240,6 @@ congestion_drop: | |||
240 | return NET_XMIT_CN; | 240 | return NET_XMIT_CN; |
241 | } | 241 | } |
242 | 242 | ||
243 | static int gred_requeue(struct sk_buff *skb, struct Qdisc* sch) | ||
244 | { | ||
245 | struct gred_sched *t = qdisc_priv(sch); | ||
246 | struct gred_sched_data *q; | ||
247 | u16 dp = tc_index_to_dp(skb); | ||
248 | |||
249 | if (dp >= t->DPs || (q = t->tab[dp]) == NULL) { | ||
250 | if (net_ratelimit()) | ||
251 | printk(KERN_WARNING "GRED: Unable to relocate VQ 0x%x " | ||
252 | "for requeue, screwing up backlog.\n", | ||
253 | tc_index_to_dp(skb)); | ||
254 | } else { | ||
255 | if (red_is_idling(&q->parms)) | ||
256 | red_end_of_idle_period(&q->parms); | ||
257 | q->backlog += qdisc_pkt_len(skb); | ||
258 | } | ||
259 | |||
260 | return qdisc_requeue(skb, sch); | ||
261 | } | ||
262 | |||
263 | static struct sk_buff *gred_dequeue(struct Qdisc* sch) | 243 | static struct sk_buff *gred_dequeue(struct Qdisc* sch) |
264 | { | 244 | { |
265 | struct sk_buff *skb; | 245 | struct sk_buff *skb; |
@@ -602,7 +582,7 @@ static struct Qdisc_ops gred_qdisc_ops __read_mostly = { | |||
602 | .priv_size = sizeof(struct gred_sched), | 582 | .priv_size = sizeof(struct gred_sched), |
603 | .enqueue = gred_enqueue, | 583 | .enqueue = gred_enqueue, |
604 | .dequeue = gred_dequeue, | 584 | .dequeue = gred_dequeue, |
605 | .requeue = gred_requeue, | 585 | .peek = qdisc_peek_head, |
606 | .drop = gred_drop, | 586 | .drop = gred_drop, |
607 | .init = gred_init, | 587 | .init = gred_init, |
608 | .reset = gred_reset, | 588 | .reset = gred_reset, |