path: root/net/ipv4/ip_forward.c
diff options
authorEric Dumazet <edumazet@google.com>2018-12-14 06:46:49 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-15 13:24:21 -0800
commit8203e2d844d34af247a151d8ebd68553a6e91785 (patch)
treedd325f46914c58dcca8925b2d8d7e2c1116a4e40 /net/ipv4/ip_forward.c
parentmod_devicetable.h: correct kerneldoc typo, "PHYSID2" -> "MII_PHYSID2" (diff)
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: 80b14dee2bea ("net: Add a new socket option for a future transmit time.") Fixes: fb420d5d91c1 ("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>
Diffstat (limited to 'net/ipv4/ip_forward.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index 32662e9e5d21..d5984d31ab93 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -72,6 +72,7 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *s
if (unlikely(opt->optlen))
+ skb->tstamp = 0;
return dst_output(net, sk, skb);