Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / drivers / net / usb / kaweth.c

diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index 60d29440f31643d40792263b28fdd79db0955142..569ad8bfd3833448aec6625f0b1bd87a6441d1a9 100644 (file)
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -70,7 +70,7 @@
 #define KAWETH_TX_TIMEOUT              (5 * HZ)
 #define KAWETH_SCRATCH_SIZE            32
 #define KAWETH_FIRMWARE_BUF_SIZE       4096
-#define KAWETH_CONTROL_TIMEOUT         (30 * HZ)
+#define KAWETH_CONTROL_TIMEOUT         (30000)
 
 #define KAWETH_STATUS_BROKEN           0x0000001
 #define KAWETH_STATUS_CLOSING          0x0000002
@@ -635,7 +635,7 @@ static void kaweth_usb_receive(struct urb *urb)
 
                skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
 
-               eth_copy_and_sum(skb, kaweth->rx_buf + 2, pkt_len, 0);
+               skb_copy_to_linear_data(skb, kaweth->rx_buf + 2, pkt_len);
 
                skb_put(skb, pkt_len);
 
@@ -1152,8 +1152,6 @@ err_fw:
 
        INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
 
-       SET_MODULE_OWNER(netdev);
-
        usb_set_intfdata(intf, kaweth);
 
 #if 0