From 91a3ce812c255f123908509c3444bfa9cfeb7a7b Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 22 Oct 2009 20:21:02 +0200
Subject: [PATCH] --- yaml --- r: 171455 b: refs/heads/master c:
 547810e3af15cf9efc3b3ebaa7b006ef606fc892 h: refs/heads/master i:   171453:
 c3c051a47f596bb195a9400949bd865417659900   171451:
 49233d370f5e8bef4247ebe4bfc0af2782b539e4   171447:
 1193c9250465f87e791c6b2758d0d9f4357f10ad   171439:
 2166f7f47a8cb740344f698b1a1bd6acbe228905   171423:
 87a64143147db8fe6a3dacb43a90c434ca19a202   171391:
 02402d304021eb181a8d5194762bbcce3af8f833 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/wireless/mwl8k.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 956507300578..ed4e5e21286e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54bc3a0d7a0c9a13da31183609c42cf7786138e1
+refs/heads/master: 547810e3af15cf9efc3b3ebaa7b006ef606fc892
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index c9a4c1e1987f..11669ed8829d 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/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;