mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
ipvs: clear skb->tstamp in forwarding path
[ Upstream commit7980d2eabd
] fq qdisc requires tstamp to be cleared in forwarding path Reported-by: Evgeny B <abt-admin@mail.ru> Link: https://bugzilla.kernel.org/show_bug.cgi?id=209427 Suggested-by: Eric Dumazet <eric.dumazet@gmail.com> Fixes:8203e2d844
("net: clear skb->tstamp in forwarding paths") Fixes:fb420d5d91
("tcp/fq: move back to CLOCK_MONOTONIC") Fixes:80b14dee2b
("net: Add a new socket option for a future transmit time.") Signed-off-by: Julian Anastasov <ja@ssi.bg> Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7c83fe15ec
commit
76c0e4b2a5
1 changed files with 6 additions and 0 deletions
|
@ -615,6 +615,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
|
|||
if (ret == NF_ACCEPT) {
|
||||
nf_reset_ct(skb);
|
||||
skb_forward_csum(skb);
|
||||
if (skb->dev)
|
||||
skb->tstamp = 0;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -655,6 +657,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
|
|||
|
||||
if (!local) {
|
||||
skb_forward_csum(skb);
|
||||
if (skb->dev)
|
||||
skb->tstamp = 0;
|
||||
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
|
||||
NULL, skb_dst(skb)->dev, dst_output);
|
||||
} else
|
||||
|
@ -675,6 +679,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
|
|||
if (!local) {
|
||||
ip_vs_drop_early_demux_sk(skb);
|
||||
skb_forward_csum(skb);
|
||||
if (skb->dev)
|
||||
skb->tstamp = 0;
|
||||
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
|
||||
NULL, skb_dst(skb)->dev, dst_output);
|
||||
} else
|
||||
|
|
Loading…
Reference in a new issue