projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0295a3
)
ASIX: Simplify condition in rx_fixup()
author
Marek Vasut
<marek.vasut@gmail.com>
Tue, 26 Jul 2011 16:44:46 +0000
(16:44 +0000)
committer
David S. Miller
<davem@davemloft.net>
Thu, 28 Jul 2011 05:39:31 +0000
(22:39 -0700)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/asix.c
patch
|
blob
|
history
diff --git
a/drivers/net/usb/asix.c
b/drivers/net/usb/asix.c
index
5250288
..
d5b62a4
100644
(file)
--- 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);