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 -uprN wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2400pci.c
wireless-2.6-name/drivers/net/wireless/rt2x00/rt2400pci.c
--- wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2400pci.c 2006-02-28
17:45:21.000000000 +0100
+++ wireless-2.6-name/drivers/net/wireless/rt2x00/rt2400pci.c 2006-02-28
17:56:47.000000000 +0100
@@ -43,6 +43,9 @@
#include <asm/io.h>
+/*
+ * Set enviroment defines for rt2x00.h
+ */
#define DRV_NAME "rt2400pci"
#ifdef CONFIG_RT2400PCI_DEBUG
@@ -753,7 +753,7 @@ rt2400pci_rxdone(void *data)
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);
@@ -2076,7 +2079,7 @@ rt2400pci_initialize(struct pci_dev *pci
return -ENOMEM;
}
- rt2x00pci->workqueue = create_singlethread_workqueue("rt2400pci");
+ rt2x00pci->workqueue = create_singlethread_workqueue(DRV_NAME);
if(!rt2x00pci->workqueue)
goto exit_iounmap;
@@ -2097,9 +2100,9 @@ rt2400pci_initialize(struct pci_dev *pci
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 -uprN wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2500pci.c
wireless-2.6-name/drivers/net/wireless/rt2x00/rt2500pci.c
--- wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2500pci.c 2006-02-28
17:45:15.000000000 +0100
+++ wireless-2.6-name/drivers/net/wireless/rt2x00/rt2500pci.c 2006-02-28
17:57:37.000000000 +0100
@@ -43,6 +43,9 @@
#include <asm/io.h>
+/*
+ * Set enviroment defines for rt2x00.h
+ */
#define DRV_NAME "rt2500pci"
#ifdef CONFIG_RT2500PCI_DEBUG
@@ -784,7 +784,7 @@ rt2500pci_rxdone(void *data)
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);
@@ -2319,7 +2322,7 @@ rt2500pci_initialize(struct pci_dev *pci
return -ENOMEM;
}
- rt2x00pci->workqueue = create_singlethread_workqueue("rt2500pci");
+ rt2x00pci->workqueue = create_singlethread_workqueue(DRV_NAME);
if(!rt2x00pci->workqueue)
goto exit_iounmap;
@@ -2340,9 +2343,9 @@ rt2500pci_initialize(struct pci_dev *pci
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 -uprN wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2500usb.c
wireless-2.6-name/drivers/net/wireless/rt2x00/rt2500usb.c
--- wireless-2.6-rx/drivers/net/wireless/rt2x00/rt2500usb.c 2006-02-28
17:45:10.000000000 +0100
+++ wireless-2.6-name/drivers/net/wireless/rt2x00/rt2500usb.c 2006-02-28
17:57:39.000000000 +0100
@@ -19,8 +19,8 @@
*/
/*
- Module: rt2x00usb
- Abstract: rt2x00usb device specific routines.
+ Module: rt2500usb
+ Abstract: rt2500usb device specific routines.
Supported chipsets: RT2570.
*/
@@ -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
@@ -651,7 +651,7 @@ rt2500usb_rxdone(void *data)
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);
@@ -2004,7 +2007,7 @@ rt2500usb_initialize(struct usb_interfac
rt2x00usb->usb_intf = usb_intf;
- rt2x00usb->workqueue = create_singlethread_workqueue("rt2500usb");
+ rt2x00usb->workqueue = create_singlethread_workqueue(DRV_NAME);
if(!rt2x00usb->workqueue)
return -ENODEV;
@@ -2200,6 +2200,7 @@ static struct usb_device_id rt2500usb_de
{ 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},
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
