From b5e8785140059263bf6ef3db93cd2fc34dc111c3 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 13 Nov 2012 13:10:59 +0000
Subject: [PATCH] --- yaml --- r: 335749 b: refs/heads/master c:
 1ba56fb45a927d083f655302e75a1911a75b5da6 h: refs/heads/master i:   335747:
 75afb60e431bc13dd829041040bb1ae34bd9d66e v: v3

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

diff --git a/[refs] b/[refs]
index 1f90260192a9..67b0320501db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb5ce43997b10dd07a63befeb26778d996c5a356
+refs/heads/master: 1ba56fb45a927d083f655302e75a1911a75b5da6
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index 3d0bf664ea35..8b5c61917076 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -1102,6 +1102,10 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
 
 		if (!tb[IFLA_MTU])
 			dev->mtu = lowerdev->mtu - VXLAN_HEADROOM;
+
+		/* update header length based on lower device */
+		dev->hard_header_len = lowerdev->hard_header_len +
+				       VXLAN_HEADROOM;
 	}
 
 	if (data[IFLA_VXLAN_TOS])