aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwl8k.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-01-04 21:56:19 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-05 17:13:30 -0500
commit9e1b17ead81e72d3db37b4cf15cde1f613603822 (patch)
treef4274b9c71c8fd695859270b87cc84f327aa1562 /drivers/net/wireless/mwl8k.c
parentc3cbbe8a5cd2886e13e9c93e059d9761f3715665 (diff)
downloadkernel_samsung_smdk4412-9e1b17ead81e72d3db37b4cf15cde1f613603822.zip
kernel_samsung_smdk4412-9e1b17ead81e72d3db37b4cf15cde1f613603822.tar.gz
kernel_samsung_smdk4412-9e1b17ead81e72d3db37b4cf15cde1f613603822.tar.bz2
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/mwl8k.c')
-rw-r--r--drivers/net/wireless/mwl8k.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index fa7b4fe..de74c11 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)
}
enum {
- MWL8687 = 0,
+ MWL8363 = 0,
+ MWL8687,
MWL8366,
};
static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = {
+ [MWL8363] = {
+ .part_name = "88w8363",
+ .helper_image = "mwl8k/helper_8363.fw",
+ .fw_image = "mwl8k/fmimage_8363.fw",
+ },
[MWL8687] = {
.part_name = "88w8687",
.helper_image = "mwl8k/helper_8687.fw",
@@ -3363,6 +3369,8 @@ static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = {
};
static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
+ { PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, },
+ { PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, },
{ PCI_VDEVICE(MARVELL, 0x2a2b), .driver_data = MWL8687, },
{ PCI_VDEVICE(MARVELL, 0x2a30), .driver_data = MWL8687, },
{ PCI_VDEVICE(MARVELL, 0x2a40), .driver_data = MWL8366, },