From db79a621835ee91d3e10177abd97f48e0a4dcf9b Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 4 Feb 2015 17:00:04 +0100 Subject: [PATCH] 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 --- drivers/net/vxlan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index c184717e8b28..d08072c10aa9 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1667,6 +1667,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);