int51x1.patch - www.codemadness.org - www.codemadness.org saait content files
(HTM) git clone git://git.codemadness.org/www.codemadness.org
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
int51x1.patch (2341B)
---
1 --- a/devolo_usb.c 2007-08-30 01:51:53.000000000 -0700
2 +++ b/devolo_usb.c 2008-08-26 14:08:21.000000000 -0700
3 @@ -19,7 +19,6 @@
4 #include <linux/module.h>
5 #include <linux/ethtool.h>
6 #include <asm/uaccess.h>
7 -#include <linux/config.h>
8 #include <linux/kmod.h>
9 #include <linux/random.h>
10 #include <asm/unaligned.h>
11 @@ -40,11 +39,7 @@
12 {},
13 };
14
15 -#if defined(MODULE_LICENSE)
16 -MODULE_LICENSE ("devolo AG");
17 -#endif
18 -
19 -
20 +MODULE_LICENSE ("GPL");
21 MODULE_AUTHOR (DRIVER_AUTHOR);
22 MODULE_DESCRIPTION (DRIVER_DESC);
23 MODULE_DEVICE_TABLE (usb, plUsb_ids);
24 @@ -132,7 +127,7 @@
25
26 skb->dev = net;
27
28 - eth_copy_and_sum (skb, devolo->rx_buff, count, 0);
29 + memcpy(skb->data, devolo->rx_buff, count);
30 /* bug 1180*/
31 skb_put (skb, count-2);
32
33 @@ -150,9 +145,9 @@
34 devolo->stats.rx_bytes += count;
35
36 goon:
37 - FILL_BULK_URB (devolo->rx_urb, devolo->usb,
38 + usb_fill_bulk_urb (devolo->rx_urb, devolo->usb,
39 usb_rcvbulkpipe (devolo->usb, 1), devolo->rx_buff,
40 - DEVOLO_MAX_MTU, devolo_read_bulk_callback, devolo);
41 + DEVOLO_MAX_MTU, (usb_complete_t)devolo_read_bulk_callback, devolo);
42 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
43 if ((res = usb_submit_urb (devolo->rx_urb,GFP_ATOMIC)))
44 #else
45 @@ -246,9 +241,9 @@
46 ((unsigned char *) devolo->tx_buff)[1] = (l16 & 0x700) >> 8;
47 memcpy (devolo->tx_buff+2, skb->data, skb->len);
48
49 - FILL_BULK_URB (devolo->tx_urb, devolo->usb,
50 + usb_fill_bulk_urb (devolo->tx_urb, devolo->usb,
51 usb_sndbulkpipe (devolo->usb, 2), devolo->tx_buff,
52 - count, devolo_write_bulk_callback, devolo);
53 + count, (usb_complete_t)devolo_write_bulk_callback, devolo);
54
55 /*
56 * Submit urb and update stats
57 @@ -355,10 +350,10 @@
58 // set_ethernet_addr(devolo);
59
60 devolo->flags &= ~DEVOLO_RX_BUSY;
61 - FILL_BULK_URB (devolo->rx_urb, devolo->usb,
62 + usb_fill_bulk_urb(devolo->rx_urb, devolo->usb,
63 usb_rcvbulkpipe (devolo->usb, 1),
64 devolo->rx_buff, DEVOLO_MAX_MTU,
65 - devolo_read_bulk_callback,devolo);
66 + (usb_complete_t)devolo_read_bulk_callback,devolo);
67
68 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
69 if ((res = usb_submit_urb (devolo->rx_urb,GFP_KERNEL/*GFP_ATOMIC??*/)))
70 @@ -639,7 +634,6 @@
71 ether_setup (net);
72 devolo->usb = dev;
73 devolo->net = net;
74 - SET_MODULE_OWNER (net);
75 net->priv = devolo;
76 net->open = devolo_open;
77 net->stop = devolo_close;