Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux

[~andy/linux] / arch / um / include / shared / net_user.h

diff --git a/arch/um/include/shared/net_user.h b/arch/um/include/shared/net_user.h
index 63bee158cd8efbe2639f5a293c741ca5af1623ef..3dabbe128e40b0186538f9b4389a1311f2b738f2 100644 (file)
--- a/arch/um/include/shared/net_user.h
+++ b/arch/um/include/shared/net_user.h
@@ -8,7 +8,7 @@
 
 #define ETH_ADDR_LEN (6)
 #define ETH_HEADER_ETHERTAP (16)
-#define ETH_HEADER_OTHER (14)
+#define ETH_HEADER_OTHER (26) /* 14 for ethernet + VLAN + MPLS for crazy people */
 #define ETH_MAX_PACKET (1500)
 
 #define UML_NET_VERSION (4)