aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2011-07-26 12:44:46 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-28 01:39:31 -0400
commitbc466e678d0a98f445bf3f9c76fedf18e7dcc6b0 (patch)
tree02ae33658d0737ae61aa62ca85f8c118a0af71f9
parenta0295a3b6775ab88f5883684e14bbda8d287822d (diff)
ASIX: Simplify condition in rx_fixup()
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/asix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 52502883523e..d5b62a463401 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)
314 skb_pull(skb, 4); 314 skb_pull(skb, 4);
315 315
316 while (skb->len > 0) { 316 while (skb->len > 0) {
317 if ((short)(header & 0x0000ffff) != 317 if ((header & 0xffff) != ((~header >> 16) & 0xffff))
318 ~((short)((header & 0xffff0000) >> 16))) {
319 netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n"); 318 netdev_err(dev->net, "asix_rx_fixup() Bad Header Length\n");
320 } 319
321 /* get the packet length */ 320 /* get the packet length */
322 size = (u16) (header & 0x0000ffff); 321 size = (u16) (header & 0x0000ffff);
323 322