diff --git a/[refs] b/[refs]
index 474d655e4316..00e019780a36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f47d69c44902c265dc2ad5a960978a97b45e3d
+refs/heads/master: 2840bf22866935fe7197582bcbe2cde4503e0bba
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index 4be2784e7ac2..0b95d5fffce7 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -983,6 +983,7 @@ static void vxlan_setup(struct net_device *dev)
 
 	eth_hw_addr_random(dev);
 	ether_setup(dev);
+	dev->hard_header_len = ETH_HLEN + VXLAN_HEADROOM;
 
 	dev->netdev_ops = &vxlan_netdev_ops;
 	dev->destructor = vxlan_free;