| 1 |
diff -Naur rt2570-k2wrlz-1.6.1/Module/rtusb_main.c rt2570-k2wrlz-1.6.1-24/Module/rtusb_main.c |
| 2 |
--- rt2570-k2wrlz-1.6.1/Module/rtusb_main.c 2007-07-05 18:41:51.000000000 +0200 |
| 3 |
+++ rt2570-k2wrlz-1.6.1-24/Module/rtusb_main.c 2008-06-27 10:48:28.000000000 +0200 |
| 4 |
@@ -1629,7 +1629,9 @@ |
| 5 |
netif_stop_queue(netdev); |
| 6 |
pAdapter->config = dev->config; |
| 7 |
pAdapter->usb = dev; |
| 8 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 9 |
SET_MODULE_OWNER(pAdapter->net); |
| 10 |
+#endif |
| 11 |
ether_setup(pAdapter->net); |
| 12 |
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) |
| 13 |
SET_ETHTOOL_OPS(net_dev, &rt2x00_ethtool_ops); |
| 14 |
@@ -1650,7 +1652,9 @@ |
| 15 |
pAdapter->net->hard_header_len = 14; |
| 16 |
pAdapter->net->mtu = 1500; |
| 17 |
pAdapter->net->addr_len = 6; |
| 18 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 19 |
pAdapter->net->weight = 64; |
| 20 |
+#endif |
| 21 |
pAdapter->MediaState = NdisMediaStateDisconnected; |
| 22 |
|
| 23 |
{// find available |
| 24 |
@@ -1961,7 +1965,9 @@ |
| 25 |
netif_stop_queue(netdev); |
| 26 |
pAdapter->config = &dev->config->desc; |
| 27 |
pAdapter->usb = dev; |
| 28 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 29 |
SET_MODULE_OWNER(pAdapter->net); |
| 30 |
+#endif |
| 31 |
ether_setup(pAdapter->net); |
| 32 |
netdev->open = usb_rtusb_open; |
| 33 |
netdev->stop = usb_rtusb_close; |
| 34 |
@@ -1981,7 +1987,9 @@ |
| 35 |
pAdapter->net->hard_header_len = 14; |
| 36 |
pAdapter->net->mtu = 1500; |
| 37 |
pAdapter->net->addr_len = 6; |
| 38 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) |
| 39 |
pAdapter->net->weight = 64; |
| 40 |
+#endif |
| 41 |
pAdapter->MediaState = NdisMediaStateDisconnected; |
| 42 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) |
| 43 |
pAdapter->MLMEThr_pid= -1; |
| 44 |
@@ -2011,8 +2019,11 @@ |
| 45 |
for (i = 0; i < 8; i++) |
| 46 |
{ |
| 47 |
sprintf(slot_name, pAdapter->net->name, i); |
| 48 |
- |
| 49 |
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) |
| 50 |
+ for (device = first_net_device(&init_net); device != NULL; |
| 51 |
+#else |
| 52 |
for (device = first_net_device(); device != NULL; |
| 53 |
+#endif |
| 54 |
device = next_net_device(device)) |
| 55 |
{ |
| 56 |
if (strncmp(device->name, slot_name, IFNAMSIZ) == 0) |