diff options
| author | Eric Dumazet <edumazet@google.com> | 2018-11-11 03:22:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-11 21:21:31 +0300 |
| commit | 7236ead1b14923f3ba35cd29cce13246be83f451 (patch) | |
| tree | 7e111a6aa40a9e3b196b7a9570dbba98edee6843 /net/sched/sch_netem.c | |
| parent | a9049ff9214da68df1179a7d5e36b43479abc9b8 (diff) | |
| download | linux-7236ead1b14923f3ba35cd29cce13246be83f451.tar.xz | |
act_mirred: clear skb->tstamp on redirect
If sch_fq is used at ingress, skbs that might have been
timestamped by net_timestamp_set() if a packet capture
is requesting timestamps could be delayed by arbitrary
amount of time, since sch_fq time base is MONOTONIC.
Fix this problem by moving code from sch_netem.c to act_mirred.c.
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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: */ skb->dev = qdisc_dev(sch); -#ifdef CONFIG_NET_CLS_ACT - /* - * If it's at ingress let's pretend the delay is - * from the network (tstamp will be updated). - */ - if (skb->tc_redirected && skb->tc_from_ingress) - skb->tstamp = 0; -#endif - if (q->slot.slot_next) { q->slot.packets_left--; q->slot.bytes_left -= qdisc_pkt_len(skb); |