---

yaml --- r: 335749 b: refs/heads/master c: 1ba56fb h: refs/heads/master i: 335747: 75afb60 v: v3
git-mirror · Nov 13, 2012 · b5e8785 · b5e8785
1 parent 52d5833
commit b5e8785
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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])