浏览代码

sch_netem: Replace ->requeue() method with open code

After removing netem classful functionality we are sure its inner
qdisc is tfifo, so we can replace qdisc->ops->requeue() method with
open code. After this patch there are no more ops->requeue() users.

The idea of this patch is by Patrick McHardy.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jarek Poplawski 16 年之前
父节点
当前提交
8ba25dad0a
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      net/sched/sch_netem.c

+ 5 - 1
net/sched/sch_netem.c

@@ -233,7 +233,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 		 */
 		 */
 		cb->time_to_send = psched_get_time();
 		cb->time_to_send = psched_get_time();
 		q->counter = 0;
 		q->counter = 0;
-		ret = q->qdisc->ops->requeue(skb, q->qdisc);
+
+		__skb_queue_head(&q->qdisc->q, skb);
+		q->qdisc->qstats.backlog += qdisc_pkt_len(skb);
+		q->qdisc->qstats.requeues++;
+		ret = NET_XMIT_SUCCESS;
 	}
 	}
 
 
 	if (likely(ret == NET_XMIT_SUCCESS)) {
 	if (likely(ret == NET_XMIT_SUCCESS)) {