diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /drivers/net/usb/gl620a.c | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'drivers/net/usb/gl620a.c')
| -rw-r--r-- | drivers/net/usb/gl620a.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c index e4a8a93fbaf7..1cc24e6f23e2 100644 --- a/drivers/net/usb/gl620a.c +++ b/drivers/net/usb/gl620a.c | |||
| @@ -84,6 +84,10 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | |||
| 84 | u32 size; | 84 | u32 size; |
| 85 | u32 count; | 85 | u32 count; |
| 86 | 86 | ||
| 87 | /* This check is no longer done by usbnet */ | ||
| 88 | if (skb->len < dev->net->hard_header_len) | ||
| 89 | return 0; | ||
| 90 | |||
| 87 | header = (struct gl_header *) skb->data; | 91 | header = (struct gl_header *) skb->data; |
| 88 | 92 | ||
| 89 | // get the packet count of the received skb | 93 | // get the packet count of the received skb |