| Message ID | 1311734687-23551-1-git-send-email-marek.vasut@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Marek Vasut <marek.vasut@gmail.com> Date: Wed, 27 Jul 2011 04:44:46 +0200 > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 5250288..d5b62a4 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -314,10 +314,9 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb) skb_pull(skb, 4); while (skb->len > 0) { - if ((short)(header & 0x0000ffff) != - ~((short)((header & 0xffff0000) >> 16))) { + if ((header & 0xffff) != ((~header >> 16) & 0xffff)) netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n"); - } + /* get the packet length */ size = (u16) (header & 0x0000ffff);
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> --- drivers/net/usb/asix.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)