[PATCH 2/5] RT2x00 update: trivial fixes

[Ivo van Doorn]

ieee80211_rx has been renamed __ieee80211_rx.
Use DRV_NAME as much as possible instead of a seperate name string.
Add new USB device ID.

Signed-off-by Ivo van Doorn <[EMAIL PROTECTED]>

diff -U 3 -H -w -E -d -r -N -- 
wireless-2.6/drivers/net/wireless/rt2x00/rt2400pci.c 
wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2400pci.c
--- wireless-2.6/drivers/net/wireless/rt2x00/rt2400pci.c        2006-02-09 
20:35:21.000000000 +0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2400pci.c 2006-02-11 
22:56:08.000000000 +0100
@@ -43,6 +43,9 @@
 
 #include <asm/io.h>
 
+/*
+ * Set enviroment defines for rt2x00.h
+ */
 #define DRV_NAME                       "rt2400pci"
 
 #ifdef CONFIG_RT2400PCI_DEBUG
@@ -761,7 +758,7 @@
 
                        memcpy(skb_put(skb, size), entry->data_addr, size);
 
-                       ieee80211_rx(net_dev, skb, &ring->params.rx);
+                       __ieee80211_rx(net_dev, skb, &ring->params.rx);
                }
 
                rt2x00_set_field32(&rxd->word0, RXD_W0_OWNER_NIC, 1);
@@ -2051,7 +2090,7 @@
                return -ENOMEM;
        }
 
-       rt2x00pci->workqueue = create_singlethread_workqueue("rt2400pci");
+       rt2x00pci->workqueue = create_singlethread_workqueue(DRV_NAME);
        if(!rt2x00pci->workqueue)
                goto exit_iounmap;
@@ -2072,9 +2111,9 @@
                goto exit_destroy_workqueue;
 
 #ifdef CONFIG_RT2400PCI_BUTTON
-       strcpy(acpi_device_class(&rt2x00pci->acpi_dev), "rt2400pci_button");
-       strcpy(acpi_device_bid(&rt2x00pci->acpi_dev), "rt2400pci");
-       strcpy(acpi_device_name(&rt2x00pci->acpi_dev), "rt2400pci");
+       strcpy(acpi_device_class(&rt2x00pci->acpi_dev), DRV_NAME "_button");
+       strcpy(acpi_device_bid(&rt2x00pci->acpi_dev), DRV_NAME);
+       strcpy(acpi_device_name(&rt2x00pci->acpi_dev), DRV_NAME);
 
        init_timer(&rt2x00pci->poll_timer);
 
diff -U 3 -H -w -E -d -r -N -- 
wireless-2.6/drivers/net/wireless/rt2x00/rt2500pci.c 
wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2500pci.c
--- wireless-2.6/drivers/net/wireless/rt2x00/rt2500pci.c        2006-02-09 
20:35:21.000000000 +0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2500pci.c 2006-02-11 
22:56:28.000000000 +0100
@@ -43,6 +43,9 @@
 
 #include <asm/io.h>
 
+/*
+ * Set enviroment defines for rt2x00.h
+ */
 #define DRV_NAME                       "rt2500pci"
 
 #ifdef CONFIG_RT2500PCI_DEBUG
@@ -804,7 +787,7 @@
 
                        memcpy(skb_put(skb, size), entry->data_addr, size);
 
-                       ieee80211_rx(net_dev, skb, &ring->params.rx);
+                       __ieee80211_rx(net_dev, skb, &ring->params.rx);
                }
                rt2x00_set_field32(&rxd->word0, RXD_W0_OWNER_NIC, 1);
 
@@ -2330,7 +2356,7 @@
                return -ENOMEM;
        }
 
-       rt2x00pci->workqueue = create_singlethread_workqueue("rt2500pci");
+       rt2x00pci->workqueue = create_singlethread_workqueue(DRV_NAME);
        if(!rt2x00pci->workqueue)
                goto exit_iounmap;
 
@@ -2351,9 +2377,9 @@
                goto exit_destroy_workqueue;
 
 #ifdef CONFIG_RT2500PCI_BUTTON
-       strcpy(acpi_device_class(&rt2x00pci->acpi_dev), "rt2500pci_button");
-       strcpy(acpi_device_bid(&rt2x00pci->acpi_dev), "rt2500pci");
-       strcpy(acpi_device_name(&rt2x00pci->acpi_dev), "rt2500pci");
+       strcpy(acpi_device_class(&rt2x00pci->acpi_dev), DRV_NAME "_button");
+       strcpy(acpi_device_bid(&rt2x00pci->acpi_dev), DRV_NAME);
+       strcpy(acpi_device_name(&rt2x00pci->acpi_dev), DRV_NAME);
 
        init_timer(&rt2x00pci->poll_timer);
 
diff -U 3 -H -w -E -d -r -N -- 
wireless-2.6/drivers/net/wireless/rt2x00/rt2500usb.c 
wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2500usb.c
--- wireless-2.6/drivers/net/wireless/rt2x00/rt2500usb.c        2006-02-09 
20:35:21.000000000 +0100
+++ wireless-2.6-rt2x00/drivers/net/wireless/rt2x00/rt2500usb.c 2006-02-11 
22:56:01.000000000 +0100
@@ -37,7 +37,10 @@
 #include <net/iw_handler.h>
 #include <net/d80211.h>
 
-#define DRV_NAME                       "rt2x00usb"
+/*
+ * Set enviroment defines for rt2x00.h
+ */
+#define DRV_NAME                       "rt2500usb"
 
 #ifdef CONFIG_RT2500USB_DEBUG
 #define CONFIG_RT2X00_DEBUG
@@ -668,7 +655,7 @@
 
                        memcpy(skb_put(skb, size), entry->data_addr, size);
 
-                       ieee80211_rx(net_dev, skb, &ring->params.rx);
+                       __ieee80211_rx(net_dev, skb, &ring->params.rx);
                }
 
                usb_submit_urb(entry->urb, GFP_ATOMIC);
@@ -2017,7 +2054,7 @@
 
        rt2x00usb->usb_intf = usb_intf;
 
-       rt2x00usb->workqueue = create_singlethread_workqueue("rt2500usb");
+       rt2x00usb->workqueue = create_singlethread_workqueue(DRV_NAME);
        if(!rt2x00usb->workqueue)
                return -ENODEV;
 @@ -2195,6 +2255,7 @@
        { USB_DEVICE(0x14b2, 0x3c02), .driver_info = RT2570},
        /* D-LINK */
        { USB_DEVICE(0x2001, 0x3c00), .driver_info = RT2570},
+       { USB_DEVICE(0x07d1, 0x3c03), .driver_info = RT2570},
        /* Gigabyte */
        { USB_DEVICE(0x1044, 0x8001), .driver_info = RT2570},
        { USB_DEVICE(0x1044, 0x8007), .driver_info = RT2570},

pgpaFCqcUOqSS.pgp
Description: PGP signature