From: Jiri Benc <jbenc@redhat.com>
Date: Fri, 4 Dec 2015 12:54:03 +0000 (+0100)
Subject: vxlan: fix incorrect RCO bit in VXLAN header
X-Git-Tag: v4.1.12-92~201^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3c939a12ddebf0dd488d7cdc6e91d95564ca715;p=users%2Fjedix%2Flinux-maple.git

vxlan: fix incorrect RCO bit in VXLAN header

Orabug: 22623878

[ Upstream commit c5fb8caaf91ea6a92920cf24db10cfc94d58de0f ]

Commit 3511494ce2f3d ("vxlan: Group Policy extension") changed definition of
VXLAN_HF_RCO from 0x00200000 to BIT(24). This is obviously incorrect. It's
also in violation with the RFC draft.

Fixes: 3511494ce2f3d ("vxlan: Group Policy extension")
Cc: Thomas Graf <tgraf@suug.ch>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit d599ae203c46fa6de7af4564c3fef8015f3012ca)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index 0082b5d33d7d3..7ef9272a405aa 100644
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -78,7 +78,7 @@ struct vxlanhdr {
 };
 
 /* VXLAN header flags. */
-#define VXLAN_HF_RCO BIT(24)
+#define VXLAN_HF_RCO BIT(21)
 #define VXLAN_HF_VNI BIT(27)
 #define VXLAN_HF_GBP BIT(31)