uml: UML net driver does not allow for vlans

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Alan Cox and committed by

Linus Torvalds 17 years ago 7e1cb780 189e91f5

+1 -1

1 changed file

expand all

arch

include

shared

net_user.h

+1 -1

arch/um/include/shared/net_user.h

··· 8 8 9 9 #define ETH_ADDR_LEN (6) 10 10 #define ETH_HEADER_ETHERTAP (16) 11 - #define ETH_HEADER_OTHER (14) 11 + #define ETH_HEADER_OTHER (26) /* 14 for ethernet + VLAN + MPLS for crazy people */ 12 12 #define ETH_MAX_PACKET (1500) 13 13 14 14 #define UML_NET_VERSION (4)