diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-11 16:32:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-11 16:32:31 -0400 |
| commit | 62522d36d74a843e78d17f2dffc90468c6762803 (patch) | |
| tree | d9d21de6724425c1b0ba12991e0865556aeda6b4 /drivers/net/usb/asix.c | |
| parent | a71fba97295db924c0b90266e9833e5059fead24 (diff) | |
| parent | e79aa8671033535c2e9ffc0a68010ae49ed5734c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb/asix.c')
| -rw-r--r-- | drivers/net/usb/asix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 7e797ed0439a..aea4645be7f6 100644 --- 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) | |||
| 344 | return 2; | 344 | return 2; |
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | if (size > ETH_FRAME_LEN) { | 347 | if (size > dev->net->mtu + ETH_HLEN) { |
| 348 | netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n", | 348 | netdev_err(dev->net, "asix_rx_fixup() Bad RX Length %d\n", |
| 349 | size); | 349 | size); |
| 350 | return 0; | 350 | return 0; |