summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2009-06-16 15:33:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 19:47:46 -0700
commit7e1cb780452809da09ee47860736a9c8d86d67c6 (patch)
tree020f0cdac4dff957d9c3de368a682e2f43bafea3 /arch
parent189e91f5f5c09043ef78cad956a71ac339203a5d (diff)
downloadlinux-7e1cb780452809da09ee47860736a9c8d86d67c6.tar.bz2
uml: UML net driver does not allow for vlans
See ancient discussion at http://marc.info/?l=user-mode-linux-devel&m=101990155831279&w=2 Addresses http://bugzilla.kernel.org/show_bug.cgi?id=7854 Signed-off-by: Alan Cox <alan@linux.intel.com> Reported-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Cc: Roland Kletzing <devzero@web.de> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/include/shared/net_user.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/shared/net_user.h b/arch/um/include/shared/net_user.h
index 63bee158cd8e..3dabbe128e40 100644
--- 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)