git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
usb
/
asix.c
diff --git
a/drivers/net/usb/asix.c
b/drivers/net/usb/asix.c
index
1f802e9
..
9516f38
100644
(file)
--- a/
drivers/net/usb/asix.c
+++ b/
drivers/net/usb/asix.c
@@
-344,7
+344,7
@@
static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
return 2;
}
- if (size >
ETH_FRAME_
LEN) {
+ if (size >
dev->net->mtu + ETH_H
LEN) {
netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n",
size);
return 0;