From f1063b759fba1ece26dbd55e678f66c3caf59ed5 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Thu, 12 Feb 2015 21:23:08 +0100 Subject: [PATCH] datapath: vxlan: Only set has-GBP bit in header if any other bits would be set vxlan: Only set has-GBP bit in header if any other bits would be set This allows for a VXLAN-GBP socket to talk to a Linux VXLAN socket by not setting any of the bits. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller Upstream: db79a621835e ("vxlan: Only set has-GBP bit in header if any other bits would be set") Signed-off-by: Thomas Graf Acked-by: Pravin B Shelar --- datapath/linux/compat/vxlan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c index 9d7061182..84a039cf5 100644 --- a/datapath/linux/compat/vxlan.c +++ b/datapath/linux/compat/vxlan.c @@ -214,6 +214,9 @@ static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, { struct vxlanhdr_gbp *gbp; + if (!md->gbp) + return; + gbp = (struct vxlanhdr_gbp *)vxh; vxh->vx_flags |= htonl(VXLAN_HF_GBP); -- 2.20.1