---

yaml --- r: 335745 b: refs/heads/master c: 52b702f h: refs/heads/master i: 335743: 953cdb3 v: v3
git-mirror · Nov 13, 2012 · c02a2bc · c02a2bc
1 parent 174ef3e
commit c02a2bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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. */