]> git.baikalelectronics.ru Git - kernel.git/commit
net: clear skb->tstamp in forwarding paths
authorEric Dumazet <edumazet@google.com>
Fri, 14 Dec 2018 14:46:49 +0000 (06:46 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Dec 2018 21:24:21 +0000 (13:24 -0800)
commit7a510a5f3de3786f5611037a70070d822d73eaf1
treedd325f46914c58dcca8925b2d8d7e2c1116a4e40
parent1040127df8f5071e4fcfb17e8af9455a361aeb72
net: clear skb->tstamp in forwarding paths

Sergey reported that forwarding was no longer working
if fq packet scheduler was used.

This is caused by the recent switch to EDT model, since incoming
packets might have been timestamped by __net_timestamp()

__net_timestamp() uses ktime_get_real(), while fq expects packets
using CLOCK_MONOTONIC base.

The fix is to clear skb->tstamp in forwarding paths.

Fixes: 1e1ce135cbaf ("net: Add a new socket option for a future transmit time.")
Fixes: 8932dea156bd ("tcp/fq: move back to CLOCK_MONOTONIC")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Sergey Matyukevich <geomatsi@gmail.com>
Tested-by: Sergey Matyukevich <geomatsi@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_forward.c
net/ipv6/ip6_output.c