From 4552903a0dd7f6fa51a6bc9925c13654d98c6f3b Mon Sep 17 00:00:00 2001
From: Ian Coolidge <iancoolidge@gmail.com>
Date: Wed, 7 Nov 2012 14:39:18 +0000
Subject: [PATCH] --- yaml --- r: 335594 b: refs/heads/master c:
 4fe5f079b499d7ff34fd49f4005f09018c4e80aa h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/gadget/u_ether.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e76d39e4c7dd..175454f37d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dad9e94bdb1e424c4feeed715dff2fe51528289
+refs/heads/master: 4fe5f079b499d7ff34fd49f4005f09018c4e80aa
diff --git a/trunk/drivers/usb/gadget/u_ether.c b/trunk/drivers/usb/gadget/u_ether.c
index 6458764994ef..4ec3c0d7a18b 100644
--- a/trunk/drivers/usb/gadget/u_ether.c
+++ b/trunk/drivers/usb/gadget/u_ether.c
@@ -20,6 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/if_vlan.h>
 
 #include "u_ether.h"
 
@@ -295,7 +296,7 @@ static void rx_complete(struct usb_ep *ep, struct usb_request *req)
 		while (skb2) {
 			if (status < 0
 					|| ETH_HLEN > skb2->len
-					|| skb2->len > ETH_FRAME_LEN) {
+					|| skb2->len > VLAN_ETH_FRAME_LEN) {
 				dev->net->stats.rx_errors++;
 				dev->net->stats.rx_length_errors++;
 				DBG(dev, "rx length %d\n", skb2->len);