---

yaml --- r: 309488 b: refs/heads/master c: 9dae310 h: refs/heads/master v: v3
git-mirror · May 29, 2012 · 2adddab · 2adddab
1 parent ac08bac
commit 2adddab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0c6ffbcfe600606b2d913dded4dc6b37b3bbbfd
+refs/heads/master: 9dae31009b1a00d926c6fe032d5a88099620adc3
diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c
@@ -35,6 +35,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
+#include <linux/if_vlan.h>
 
 #define DRIVER_VERSION "22-Dec-2011"
 #define DRIVER_NAME "asix"
@@ -321,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 			return 0;
 		}
 
-		if ((size > dev->net->mtu + ETH_HLEN) ||
+		if ((size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) ||
 		    (size + offset > skb->len)) {
 			netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
 				   size);