From c02a2bcdf7d4fddb3e40cf0eac04dafecde9aa14 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 9 Nov 2012 13:35:24 +0000
Subject: [PATCH] --- yaml --- r: 335745 b: refs/heads/master c:
 52b702ffa509595c5d04a1a1d0f63acf92b4789b h: refs/heads/master i:   335743:
 953cdb39bffb49ffd16b858647acd15c601e8163 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/vxlan.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85f931ed4cef..0cacef4ed43c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd090dfc634ddd711a5fbd0cadc6e0ab4977bcaf
+refs/heads/master: 52b702ffa509595c5d04a1a1d0f63acf92b4789b
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index 7b4adde93c01..0c4d0f49ab46 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -50,8 +50,8 @@
 
 #define VXLAN_N_VID	(1u << 24)
 #define VXLAN_VID_MASK	(VXLAN_N_VID - 1)
-/* VLAN + IP header + UDP + VXLAN */
-#define VXLAN_HEADROOM (4 + 20 + 8 + 8)
+/* IP header + UDP + VXLAN + Ethernet header */
+#define VXLAN_HEADROOM (20 + 8 + 8 + 14)
 
 #define VXLAN_FLAGS 0x08000000	/* struct vxlanhdr.vx_flags required value. */