Several patches integrated while I was at home. See the bottom four patches
listed for 0.1.13-pre3 in CHANGES.
This commit is contained in:
mark
parent
cdab404a73
commit
2d2f878fd5
7
CHANGES
7
CHANGES
|
|
@ -42,6 +42,13 @@
|
|||
*
|
||||
* --------------------------------------------------------------------
|
||||
0.1.13
|
||||
-pre3
|
||||
- hmuurimaa's ID patch for the Omnibook500 integrated USB adapter
|
||||
- proskin's patch for MODULE_LICENSE conditional
|
||||
- dstates (JediElite) submission (others submitted it too) for the
|
||||
NDC PLX card.
|
||||
- crankin's patch for src/prism2/driver/Makefile. PCI and USB were
|
||||
linking with PLX's prism2wext.o file. DOH!
|
||||
-pre2
|
||||
- Synch'd the etc/pcmcia/wlan-ng scripts with the etc/wlan* scripts.
|
||||
This should help PCI/PLX/USB Adhoc users.
|
||||
|
|
|
|||
1
THANKS
1
THANKS
|
|
@ -75,6 +75,7 @@ Jack Diedrich <jackdied@yahoo.com>
|
|||
Caz Yokoyama <caz@caztech.com>
|
||||
Matthias Welwarsky <matze@stud.fbi.fh-darmstadt.de>
|
||||
David Brownell <david-b@pacbell.net>
|
||||
Henri Muurimaa <hezamu@tuug.fi>
|
||||
|
||||
[Many, many more. If I've overlooked you and you want to be listed here,
|
||||
send me e-mail and I'll fix it. I _know_ a bunch of linux-wlan contributors
|
||||
|
|
|
|||
|
|
@ -106,13 +106,13 @@ PLX_OBJ= $(PLX_OBJ_DIR)/prism2wext.o \
|
|||
$(PLX_OBJ_DIR)/prism2mib.o \
|
||||
$(PLX_OBJ_DIR)/hfa384x.o
|
||||
|
||||
PCI_OBJ= $(PLX_OBJ_DIR)/prism2wext.o \
|
||||
PCI_OBJ= $(PCI_OBJ_DIR)/prism2wext.o \
|
||||
$(PCI_OBJ_DIR)/prism2sta.o \
|
||||
$(PCI_OBJ_DIR)/prism2mgmt.o \
|
||||
$(PCI_OBJ_DIR)/prism2mib.o \
|
||||
$(PCI_OBJ_DIR)/hfa384x.o
|
||||
|
||||
USB_OBJ= $(PLX_OBJ_DIR)/prism2wext.o \
|
||||
USB_OBJ= $(USB_OBJ_DIR)/prism2wext.o \
|
||||
$(USB_OBJ_DIR)/prism2sta.o \
|
||||
$(USB_OBJ_DIR)/prism2mgmt.o \
|
||||
$(USB_OBJ_DIR)/prism2mib.o \
|
||||
|
|
|
|||
|
|
@ -145,6 +145,10 @@
|
|||
#define PCIVENDOR_COREGA 0x15e8UL
|
||||
#define PCIDEVICE_CGWLPCIA11 0x0130UL
|
||||
|
||||
/* National Datacomm PCI Adapter (PLX) board device+vendor ID */
|
||||
#define PCIVENDOR_NDC 0x15e8UL
|
||||
#define PCIDEVICE_UNKNOWN_PARTNUM 0x0131UL
|
||||
|
||||
/* PCI Class & Sub-Class code, Network-'Other controller' */
|
||||
#define PCI_CLASS_NETWORK_OTHERS 0x280
|
||||
#endif /* WLAN_PLX */
|
||||
|
|
@ -266,49 +270,56 @@ static struct pci_device_id pci_id_tbl[] = {
|
|||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Eumitcom WL11000 PCI card"
|
||||
(unsigned long)"Eumitcom WL11000 PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_GLOBALSUN, PCIDEVICE_GL24110P,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI card"
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_GLOBALSUN, PCIDEVICE_GL24110P_ALT,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI card"
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_NETGEAR, PCIDEVICE_MA301,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI card"
|
||||
(unsigned long)"Global Sun Tech GL24110P PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_USROBOTICS, PCIDEVICE_USR2410,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"US Robotics USR2415 PCI card"
|
||||
(unsigned long)"US Robotics USR2415 PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_Linksys, PCIDEVICE_Wpc11Wdt11,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Linksys WPC11 with WDT11 adapter (PLX)"
|
||||
(unsigned long)"Linksys WPC11 with WDT11 PCI(PLX) adapter"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_COREGA, PCIDEVICE_CGWLPCIA11,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"Corega CGWLPCIA11 PCI card"
|
||||
(unsigned long)"Corega CGWLPCIA11 PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
PCIVENDOR_NDC, PCIDEVICE_UNKNOWN_PARTNUM,
|
||||
PCI_ANY_ID, PCI_ANY_ID,
|
||||
0, 0,
|
||||
/* Driver data, we just put the name here */
|
||||
(unsigned long)"National Datacomm (unknown part#) PCI(PLX) card"
|
||||
},
|
||||
{
|
||||
0, 0, 0, 0, 0, 0, 0
|
||||
|
|
@ -376,8 +387,31 @@ typedef struct usb_prism_dev {
|
|||
} usb_prism_dev_t;
|
||||
|
||||
static usb_prism_dev_t usb_id_tbl[] = {
|
||||
{"Prism2.x 11Mbps WLAN USB Adapter", 0x09aa, 0x3642, 0},
|
||||
{"Actiontec Prism2.x 11Mbps WLAN USB Adapter", 0x066b, 0x2211, 0},
|
||||
{
|
||||
"Prism2.x 11Mbps WLAN USB Adapter",
|
||||
0x09aa,
|
||||
0x3642,
|
||||
0
|
||||
},
|
||||
{
|
||||
"Actiontec (unknown part#) Prism2.5 11Mbps WLAN USB Adapter",
|
||||
0x066b,
|
||||
0x2211,
|
||||
0
|
||||
},
|
||||
{
|
||||
"HP Omnibook 500 builtin Actiontec (unknown part#) "
|
||||
"Prism2.5 11Mbps WLAN USB Adapter",
|
||||
0x1668,
|
||||
0x0408,
|
||||
0
|
||||
},
|
||||
{
|
||||
"Linksys WUSB11v2.5 11Mbps WLAN USB Adapter",
|
||||
0x066b,
|
||||
0x2212,
|
||||
0
|
||||
},
|
||||
{NULL, 0, 0, 0}
|
||||
|
||||
};
|
||||
|
|
@ -437,7 +471,7 @@ MODULE_PARM( prism2_doreset, "i");
|
|||
MODULE_PARM( prism2_reset_holdtime, "i");
|
||||
MODULE_PARM( prism2_reset_settletime, "i");
|
||||
|
||||
#if (LINUX_VERSION_CODE >= WLAN_KVERSION(2,4,10))
|
||||
#ifdef MODULE_LICENSE
|
||||
MODULE_LICENSE("Dual MPL/GPL");
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue