aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2011-07-26 12:44:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-28 01:39:31 -0400
commitbca0beb9363f8487ac902931a50eb00180a2d14a (patch)
treef7c87ac7a9f8c055a883c695ad8c8b0db336edd6 /drivers/net/usb
parentbc466e678d0a98f445bf3f9c76fedf18e7dcc6b0 (diff)
ASIX: Use only 11 bits of header for data size
The AX88772B uses only 11 bits of the header for the actual size. The other bits are used for something else. This causes dmesg full of messages: asix_rx_fixup() Bad Header Length This patch trims the check to only 11 bits. I believe on older chips, the remaining 5 top bits are unused. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index d5b62a463401..c5c4b4def7fb 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -314,11 +314,11 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
314 skb_pull(skb, 4); 314 skb_pull(skb, 4);
315 315
316 while (skb->len > 0) { 316 while (skb->len > 0) {
317 if ((header & 0xffff) != ((~header >> 16) & 0xffff)) 317 if ((header & 0x07ff) != ((~header >> 16) & 0x07ff))
318 netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n"); 318 netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");
319 319
320 /* get the packet length */ 320 /* get the packet length */
321 size = (u16) (header & 0x0000ffff); 321 size = (u16) (header & 0x000007ff);
322 322
323 if ((skb->len) - ((size + 1) & 0xfffe) == 0) { 323 if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
324 u8 alignment = (unsigned long)skb->data & 0x3; 324 u8 alignment = (unsigned long)skb->data & 0x3;