netfilter: nf_fwd_netdev: clear timestamp in forwarding path

[ Upstream commit c77761c8a59405cb7aa44188b30fffe13fbdd02d ]

Similar to 7980d2eabde8 ("ipvs: clear skb->tstamp in forwarding path").
fq qdisc requires tstamp to be cleared in forwarding path.

Fixes: 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/nf_dup_netdev.c b/net/netfilter/nf_dup_netdev.c
index 2b01a151eaa804ac1210bed15b0c75369af9feb3..a579e59ee5c5e4cde733b324a8ce78cb3214da77 100644 (file)
--- a/net/netfilter/nf_dup_netdev.c
+++ b/net/netfilter/nf_dup_netdev.c
@@ -19,6 +19,7 @@ static void nf_do_netdev_egress(struct sk_buff *skb, struct net_device *dev)
                skb_push(skb, skb->mac_len);
 
        skb->dev = dev;
+       skb->tstamp = 0;
        dev_queue_xmit(skb);
 }
 

diff --git a/net/netfilter/nft_fwd_netdev.c b/net/netfilter/nft_fwd_netdev.c
index 3087e23297dbf7010e4237c8b0ec6bb1c2355911..b77985986b24ea6fd2f530bcc3e4befde45e3b99 100644 (file)
--- a/net/netfilter/nft_fwd_netdev.c
+++ b/net/netfilter/nft_fwd_netdev.c
@@ -138,6 +138,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr,
                return;
 
        skb->dev = dev;
+       skb->tstamp = 0;
        neigh_xmit(neigh_table, dev, addr, skb);
 out:
        regs->verdict.code = verdict;