X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fusb%2Fmcs7830.c;h=82d844a8ebd093e79c26ada9fc728fec8b10576e;hb=e1aa17c7b52c2cc1a4c20f62deadcd94ce8b632c;hp=a305a7b2dae6f85ce4877a2f38e7d413688d5b1c;hpb=cf20662db4dfade737015036fa9c63e888350c82;p=~andy%2Flinux

diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index a305a7b2dae..82d844a8ebd 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -526,8 +526,9 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
 	u8 status;
 
-	if (skb->len == 0) {
-		dev_err(&dev->udev->dev, "unexpected empty rx frame\n");
+	/* This check is no longer done by usbnet */
+	if (skb->len < dev->net->hard_header_len) {
+		dev_err(&dev->udev->dev, "unexpected tiny rx frame\n");
 		return 0;
 	}