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
tpm: read burstcount from TPM_STS in one 32-bit transaction
[pandora-kernel.git]
/
drivers
/
net
/
usb
/
net1080.c
diff --git
a/drivers/net/usb/net1080.c
b/drivers/net/usb/net1080.c
index
01db460
..
c9e3278
100644
(file)
--- a/
drivers/net/usb/net1080.c
+++ b/
drivers/net/usb/net1080.c
@@
-419,6
+419,10
@@
static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
struct nc_trailer *trailer;
u16 hdr_len, packet_len;
+ /* This check is no longer done by usbnet */
+ if (skb->len < dev->net->hard_header_len)
+ return 0;
+
if (!(skb->len & 0x01)) {
#ifdef DEBUG
struct net_device *net = dev->net;