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>

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index c9a4c1e1987f2ec6248aa9369387ff08e0083e74..11669ed8829d62ae71d07633f5d98395a1bbdd1e 100644 (file)
--- 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;