aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-10-22 14:21:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-11-06 16:54:37 -0500
commit547810e3af15cf9efc3b3ebaa7b006ef606fc892 (patch)
tree9e56bab2acb4000819a5098ed27b6d2e6b628c28
parent54bc3a0d7a0c9a13da31183609c42cf7786138e1 (diff)
mwl8k: set ->interface_modes from the driver data
As different chip/firmware combinations support different interface types. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwl8k.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index c9a4c1e1987f..11669ed8829d 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -92,6 +92,7 @@ struct mwl8k_device_info {
92 char *helper_image; 92 char *helper_image;
93 char *fw_image; 93 char *fw_image;
94 struct rxd_ops *rxd_ops; 94 struct rxd_ops *rxd_ops;
95 u16 modes;
95}; 96};
96 97
97struct mwl8k_rx_queue { 98struct mwl8k_rx_queue {
@@ -3016,6 +3017,7 @@ static struct mwl8k_device_info di_8687 = {
3016 .helper_image = "mwl8k/helper_8687.fw", 3017 .helper_image = "mwl8k/helper_8687.fw",
3017 .fw_image = "mwl8k/fmimage_8687.fw", 3018 .fw_image = "mwl8k/fmimage_8687.fw",
3018 .rxd_ops = &rxd_8687_ops, 3019 .rxd_ops = &rxd_8687_ops,
3020 .modes = BIT(NL80211_IFTYPE_STATION),
3019}; 3021};
3020 3022
3021static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { 3023static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
@@ -3122,7 +3124,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3122 3124
3123 hw->queues = MWL8K_TX_QUEUES; 3125 hw->queues = MWL8K_TX_QUEUES;
3124 3126
3125 hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); 3127 hw->wiphy->interface_modes = priv->device_info->modes;
3126 3128
3127 /* Set rssi and noise values to dBm */ 3129 /* Set rssi and noise values to dBm */
3128 hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM; 3130 hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM;