lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 294/408] netfilter: nf_fwd_netdev: clear timestamp in forwarding path
    Date
    From: Pablo Neira Ayuso <pablo@netfilter.org>

    [ 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>
    ---
    net/netfilter/nf_dup_netdev.c | 1 +
    net/netfilter/nft_fwd_netdev.c | 1 +
    2 files changed, 2 insertions(+)

    diff --git a/net/netfilter/nf_dup_netdev.c b/net/netfilter/nf_dup_netdev.c
    index f108a76925dd8..ec6e7d6860163 100644
    --- 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 3087e23297dbf..b77985986b24e 100644
    --- 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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:34    [W:2.130 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site