git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
net
/
usb
/
mcs7830.c
diff --git
a/drivers/net/usb/mcs7830.c
b/drivers/net/usb/mcs7830.c
index
db2cb74
..
a2f7579
100644
(file)
--- a/
drivers/net/usb/mcs7830.c
+++ b/
drivers/net/usb/mcs7830.c
@@
-601,8
+601,9
@@
static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
u8 status;
{
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;
}
return 0;
}