On 08/01/2019 19:45, Paolo Abeni wrote:
> Matteo reported forwarding issues inside the linux bridge,
> if the enslaved interfaces use the fq qdisc.
>
> Similar to commit 8203e2d844d3 ("net: clear skb->tstamp in
> forwarding paths"), we need to clear the tstamp field in
> the bridge forwarding path.
>
> Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit
> time.")
> Fixes: fb420d5d91c1 ("tcp/fq: move back to CLOCK_MONOTONIC")
> Reported-and-tested-by: Matteo Croce <[email protected]>
> Signed-off-by: Paolo Abeni <[email protected]>
> ---
> net/bridge/br_forward.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
> index 5372e2042adf..2cb8da465b98 100644
> --- a/net/bridge/br_forward.c
> +++ b/net/bridge/br_forward.c
> @@ -65,6 +65,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit);
>
> int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
> {
> + skb->tstamp = 0;
> return NF_HOOK(NFPROTO_BRIDGE, NF_BR_POST_ROUTING,
> net, sk, skb, NULL, skb->dev,
> br_dev_queue_push_xmit);
>
Acked-by: Nikolay Aleksandrov <[email protected]>
