diff options
Diffstat (limited to 'net/sched/sch_netem.c')
-rw-r--r-- | net/sched/sch_netem.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 57b3ad9394ad..2c38e3d07924 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
@@ -648,15 +648,6 @@ deliver: | |||
648 | */ | 648 | */ |
649 | skb->dev = qdisc_dev(sch); | 649 | skb->dev = qdisc_dev(sch); |
650 | 650 | ||
651 | #ifdef CONFIG_NET_CLS_ACT | ||
652 | /* | ||
653 | * If it's at ingress let's pretend the delay is | ||
654 | * from the network (tstamp will be updated). | ||
655 | */ | ||
656 | if (skb->tc_redirected && skb->tc_from_ingress) | ||
657 | skb->tstamp = 0; | ||
658 | #endif | ||
659 | |||
660 | if (q->slot.slot_next) { | 651 | if (q->slot.slot_next) { |
661 | q->slot.packets_left--; | 652 | q->slot.packets_left--; |
662 | q->slot.bytes_left -= qdisc_pkt_len(skb); | 653 | q->slot.bytes_left -= qdisc_pkt_len(skb); |