Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / net / usb / catc.c

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 86e90c59d55156473058e9ae6a2a6137da8e5283..76752d84a30f80f7cfcafc2bce6437c6f582bbe8 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);