aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorDoug Kehn <rdkehn@yahoo.com>2012-01-11 13:12:43 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-12 20:05:28 -0800
commit83636580ad99cffd85b07e75da7ad45ada0fd530 (patch)
treee5ce86104abbfb7e8c9da7edd7bd7fca3871b9e3 /drivers/net/ethernet
parentddecf0f4db44ef94847a62d6ecf74456b4dcc66f (diff)
downloadlinux-linaro-stable-83636580ad99cffd85b07e75da7ad45ada0fd530.tar.gz
ksz884x: fix mtu for VLAN
The Ethernet header does not account for the addition of a VLAN header. Full size Ethernet frames containing VLAN header are not processed because the frame is larger than the resulting hw mtu. Signed-off-by: Doug Kehn <rdkehn@yahoo.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 6ed09a85f035..e52cd310ae76 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -746,7 +746,7 @@
#define MAC_ADDR_ORDER(i) (ETH_ALEN - 1 - (i))
#define MAX_ETHERNET_BODY_SIZE 1500
-#define ETHERNET_HEADER_SIZE 14
+#define ETHERNET_HEADER_SIZE (14 + VLAN_HLEN)
#define MAX_ETHERNET_PACKET_SIZE \
(MAX_ETHERNET_BODY_SIZE + ETHERNET_HEADER_SIZE)