On Thu, 2012-06-07 at 13:04 +0900, Greg KH wrote:
3.4-stable review patch. If anyone has any objections, please let me know.
--
From: Eric Dumazet eduma...@google.com
[ Upstream commit 9dae31009b1a00d926c6fe032d5a88099620adc3 ]
asix driver drops 8021Q full size frames because it doesn't take into
account VLAN header size.
Tested on AX88772 adapter.
[...]
This should presumably go into earlier stable versions as well
(specifically requested for 3.2 in http://bugs.debian.org/676545).
Does the attached backport look reasonable?
Ben.
--
Ben Hutchings
I haven't lost my mind; it's backed up on tape somewhere.
From: Eric Dumazet eduma...@google.com
Date: Mon, 28 May 2012 22:31:41 +
Subject: asix: allow full size 8021Q frames to be received
commit 9dae31009b1a00d926c6fe032d5a88099620adc3 upstream.
asix driver drops 8021Q full size frames because it doesn't take into
account VLAN header size.
Tested on AX88772 adapter.
Signed-off-by: Eric Dumazet eduma...@google.com
CC: Greg Kroah-Hartman gre...@linuxfoundation.org
CC: Allan Chou al...@asix.com.tw
CC: Trond Wuellner tr...@chromium.org
CC: Grant Grundler grund...@chromium.org
CC: Paul Stewart ps...@chromium.org
Signed-off-by: David S. Miller da...@davemloft.net
[bwh: Backported to 3.2: no offset used in asix_rx_fixup()]
Signed-off-by: Ben Hutchings b...@decadent.org.uk
---
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -35,6 +35,7 @@
#include linux/crc32.h
#include linux/usb/usbnet.h
#include linux/slab.h
+#include linux/if_vlan.h
#define DRIVER_VERSION 08-Nov-2011
#define DRIVER_NAME asix
@@ -348,7 +349,7 @@
return 2;
}
- if (size dev-net-mtu + ETH_HLEN) {
+ if (size dev-net-mtu + ETH_HLEN + VLAN_HLEN) {
netdev_err(dev-net, asix_rx_fixup() Bad RX Length %d\n,
size);
return 0;
signature.asc
Description: This is a digitally signed message part
