projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v3.10/topic/misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
usb
/
smsc95xx.c
diff --git
a/drivers/net/usb/smsc95xx.c
b/drivers/net/usb/smsc95xx.c
index 3f38ba868f6182152093e8efad0a864439c5cef0..9375b8c6410b78605ae0bf998e36f8bda8adb1b4 100644
(file)
--- a/
drivers/net/usb/smsc95xx.c
+++ b/
drivers/net/usb/smsc95xx.c
@@
-1725,6
+1725,10
@@
static void smsc95xx_rx_csum_offload(struct sk_buff *skb)
static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
{
+ /* This check is no longer done by usbnet */
+ if (skb->len < dev->net->hard_header_len)
+ return 0;
+
while (skb->len > 0) {
u32 header, align_count;
struct sk_buff *ax_skb;