diff options
Diffstat (limited to 'net/sched/sch_atm.c')
-rw-r--r-- | net/sched/sch_atm.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 6eb9a650b63d..ca90f6e59aee 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c | |||
@@ -62,7 +62,7 @@ struct atm_qdisc_data { | |||
62 | struct atm_flow_data link; /* unclassified skbs go here */ | 62 | struct atm_flow_data link; /* unclassified skbs go here */ |
63 | struct atm_flow_data *flows; /* NB: "link" is also on this | 63 | struct atm_flow_data *flows; /* NB: "link" is also on this |
64 | list */ | 64 | list */ |
65 | struct tasklet_struct task; /* requeue tasklet */ | 65 | struct tasklet_struct task; /* dequeue tasklet */ |
66 | }; | 66 | }; |
67 | 67 | ||
68 | /* ------------------------- Class/flow operations ------------------------- */ | 68 | /* ------------------------- Class/flow operations ------------------------- */ |
@@ -534,23 +534,6 @@ static struct sk_buff *atm_tc_peek(struct Qdisc *sch) | |||
534 | return p->link.q->ops->peek(p->link.q); | 534 | return p->link.q->ops->peek(p->link.q); |
535 | } | 535 | } |
536 | 536 | ||
537 | static int atm_tc_requeue(struct sk_buff *skb, struct Qdisc *sch) | ||
538 | { | ||
539 | struct atm_qdisc_data *p = qdisc_priv(sch); | ||
540 | int ret; | ||
541 | |||
542 | pr_debug("atm_tc_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); | ||
543 | ret = p->link.q->ops->requeue(skb, p->link.q); | ||
544 | if (!ret) { | ||
545 | sch->q.qlen++; | ||
546 | sch->qstats.requeues++; | ||
547 | } else if (net_xmit_drop_count(ret)) { | ||
548 | sch->qstats.drops++; | ||
549 | p->link.qstats.drops++; | ||
550 | } | ||
551 | return ret; | ||
552 | } | ||
553 | |||
554 | static unsigned int atm_tc_drop(struct Qdisc *sch) | 537 | static unsigned int atm_tc_drop(struct Qdisc *sch) |
555 | { | 538 | { |
556 | struct atm_qdisc_data *p = qdisc_priv(sch); | 539 | struct atm_qdisc_data *p = qdisc_priv(sch); |
@@ -707,7 +690,6 @@ static struct Qdisc_ops atm_qdisc_ops __read_mostly = { | |||
707 | .enqueue = atm_tc_enqueue, | 690 | .enqueue = atm_tc_enqueue, |
708 | .dequeue = atm_tc_dequeue, | 691 | .dequeue = atm_tc_dequeue, |
709 | .peek = atm_tc_peek, | 692 | .peek = atm_tc_peek, |
710 | .requeue = atm_tc_requeue, | ||
711 | .drop = atm_tc_drop, | 693 | .drop = atm_tc_drop, |
712 | .init = atm_tc_init, | 694 | .init = atm_tc_init, |
713 | .reset = atm_tc_reset, | 695 | .reset = atm_tc_reset, |