diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-07-26 16:44:46 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-27 22:39:31 -0700 |
| commit | bc466e678d0a98f445bf3f9c76fedf18e7dcc6b0 (patch) | |
| tree | 02ae33658d0737ae61aa62ca85f8c118a0af71f9 /drivers/net | |
| parent | a0295a3b6775ab88f5883684e14bbda8d287822d (diff) | |
| download | op-kernel-dev-bc466e678d0a98f445bf3f9c76fedf18e7dcc6b0.zip op-kernel-dev-bc466e678d0a98f445bf3f9c76fedf18e7dcc6b0.tar.gz | |
ASIX: Simplify condition in rx_fixup()
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/usb/asix.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |
