diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-04 15:56:19 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:13:30 -0500 |
commit | 9e1b17ead81e72d3db37b4cf15cde1f613603822 (patch) | |
tree | f4274b9c71c8fd695859270b87cc84f327aa1562 /drivers/net/wireless | |
parent | c3cbbe8a5cd2886e13e9c93e059d9761f3715665 (diff) |
mwl8k: add support for 88w8363 in STA mode
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index fa7b4fe074f5..de74c111d967 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -3344,11 +3344,17 @@ static void mwl8k_finalize_join_worker(struct work_struct *work) | |||
3344 | } | 3344 | } |
3345 | 3345 | ||
3346 | enum { | 3346 | enum { |
3347 | MWL8687 = 0, | 3347 | MWL8363 = 0, |
3348 | MWL8687, | ||
3348 | MWL8366, | 3349 | MWL8366, |
3349 | }; | 3350 | }; |
3350 | 3351 | ||
3351 | static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = { | 3352 | static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = { |
3353 | [MWL8363] = { | ||
3354 | .part_name = "88w8363", | ||
3355 | .helper_image = "mwl8k/helper_8363.fw", | ||
3356 | .fw_image = "mwl8k/fmimage_8363.fw", | ||
3357 | }, | ||
3352 | [MWL8687] = { | 3358 | [MWL8687] = { |
3353 | .part_name = "88w8687", | 3359 | .part_name = "88w8687", |
3354 | .helper_image = "mwl8k/helper_8687.fw", | 3360 | .helper_image = "mwl8k/helper_8687.fw", |
@@ -3363,6 +3369,8 @@ static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = { | |||
3363 | }; | 3369 | }; |
3364 | 3370 | ||
3365 | static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { | 3371 | static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { |
3372 | { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, }, | ||
3373 | { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, }, | ||
3366 | { PCI_VDEVICE(MARVELL, 0x2a2b), .driver_data = MWL8687, }, | 3374 | { PCI_VDEVICE(MARVELL, 0x2a2b), .driver_data = MWL8687, }, |
3367 | { PCI_VDEVICE(MARVELL, 0x2a30), .driver_data = MWL8687, }, | 3375 | { PCI_VDEVICE(MARVELL, 0x2a30), .driver_data = MWL8687, }, |
3368 | { PCI_VDEVICE(MARVELL, 0x2a40), .driver_data = MWL8366, }, | 3376 | { PCI_VDEVICE(MARVELL, 0x2a40), .driver_data = MWL8366, }, |