Commit 41d1c883 authored Jan 08, 2019 by Paolo Abeni Committed by David S. Miller Jan 11, 2019

net: clear skb->tstamp in bridge forwarding path



Matteo reported forwarding issues inside the linux bridge,
if the enslaved interfaces use the fq qdisc.

Similar to commit 8203e2d8 ("net: clear skb->tstamp in
forwarding paths"), we need to clear the tstamp field in
the bridge forwarding path.

Fixes: 80b14dee ("net: Add a new socket option for a future transmit time.")
Fixes: fb420d5d ("tcp/fq: move back to CLOCK_MONOTONIC")
Reported-and-tested-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3f4261d4

net/bridge/br_forward.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);

Admin message