summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-10-22 20:21:02 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-11-06 16:54:37 -0500
commit547810e3af15cf9efc3b3ebaa7b006ef606fc892 (patch)
tree9e56bab2acb4000819a5098ed27b6d2e6b628c28 /drivers/net
parent54bc3a0d7a0c9a13da31183609c42cf7786138e1 (diff)
downloadop-kernel-dev-547810e3af15cf9efc3b3ebaa7b006ef606fc892.zip
op-kernel-dev-547810e3af15cf9efc3b3ebaa7b006ef606fc892.tar.gz
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>
Diffstat (limited to 'drivers/net')
-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 c9a4c1e..11669ed 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -92,6 +92,7 @@ struct mwl8k_device_info {
char *helper_image;
char *fw_image;
struct rxd_ops *rxd_ops;
+ u16 modes;
};
struct mwl8k_rx_queue {
@@ -3016,6 +3017,7 @@ static struct mwl8k_device_info di_8687 = {
.helper_image = "mwl8k/helper_8687.fw",
.fw_image = "mwl8k/fmimage_8687.fw",
.rxd_ops = &rxd_8687_ops,
+ .modes = BIT(NL80211_IFTYPE_STATION),
};
static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
@@ -3122,7 +3124,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
hw->queues = MWL8K_TX_QUEUES;
- hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+ hw->wiphy->interface_modes = priv->device_info->modes;
/* Set rssi and noise values to dBm */
hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_NOISE_DBM;
OpenPOWER on IntegriCloud