projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[cascardo/linux.git]
/
drivers
/
net
/
usb
/
catc.c
diff --git
a/drivers/net/usb/catc.c
b/drivers/net/usb/catc.c
index
86e90c5
..
76752d8
100644
(file)
--- a/
drivers/net/usb/catc.c
+++ b/
drivers/net/usb/catc.c
@@
-255,7
+255,7
@@
static void catc_rx_done(struct urb *urb)
if (!(skb = dev_alloc_skb(pkt_len)))
return;
-
eth_copy_and_sum(skb, pkt_start + pkt_offset, pkt_len, 0
);
+
skb_copy_to_linear_data(skb, pkt_start + pkt_offset, pkt_len
);
skb_put(skb, pkt_len);
skb->protocol = eth_type_trans(skb, catc->netdev);