Skip to content

Commit 7980d2e

Browse files
Julian Anastasovummakynes
Julian Anastasov
authored andcommitted
ipvs: clear skb->tstamp in forwarding path
fq qdisc requires tstamp to be cleared in forwarding path Reported-by: Evgeny B <[email protected]> Link: https://bugzilla.kernel.org/show_bug.cgi?id=209427 Suggested-by: Eric Dumazet <[email protected]> Fixes: 8203e2d ("net: clear skb->tstamp in forwarding paths") Fixes: fb420d5 ("tcp/fq: move back to CLOCK_MONOTONIC") Fixes: 80b14de ("net: Add a new socket option for a future transmit time.") Signed-off-by: Julian Anastasov <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent ea2f7da commit 7980d2e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

net/netfilter/ipvs/ip_vs_xmit.c

+6
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,8 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
609609
if (ret == NF_ACCEPT) {
610610
nf_reset_ct(skb);
611611
skb_forward_csum(skb);
612+
if (skb->dev)
613+
skb->tstamp = 0;
612614
}
613615
return ret;
614616
}
@@ -649,6 +651,8 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
649651

650652
if (!local) {
651653
skb_forward_csum(skb);
654+
if (skb->dev)
655+
skb->tstamp = 0;
652656
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
653657
NULL, skb_dst(skb)->dev, dst_output);
654658
} else
@@ -669,6 +673,8 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
669673
if (!local) {
670674
ip_vs_drop_early_demux_sk(skb);
671675
skb_forward_csum(skb);
676+
if (skb->dev)
677+
skb->tstamp = 0;
672678
NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
673679
NULL, skb_dst(skb)->dev, dst_output);
674680
} else

0 commit comments

Comments
 (0)