From 5c839effae194a2a99e24bd026a85e161fb6a4cb Mon Sep 17 00:00:00 2001
From: Michael Wu <flamingice@sourmilk.net>
Date: Mon, 24 Sep 2007 18:10:25 -0400
Subject: [PATCH] --- yaml --- r: 66778 b: refs/heads/master c:
 ce1234d299f3823ea07019c0f7b7b0bcb81ee7a0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3494b35596b6..cae20bd9b8cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d703e29a88c91f015aa691a195e8fd4426c4ec73
+refs/heads/master: ce1234d299f3823ea07019c0f7b7b0bcb81ee7a0
diff --git a/trunk/drivers/net/wireless/adm8211.c b/trunk/drivers/net/wireless/adm8211.c
index 95c8315d71ec..e4fdadb52503 100644
--- a/trunk/drivers/net/wireless/adm8211.c
+++ b/trunk/drivers/net/wireless/adm8211.c
@@ -1540,6 +1540,7 @@ static int adm8211_start(struct ieee80211_hw *dev)
 	ADM8211_CSR_WRITE(IER, ADM8211_IER_NIE | ADM8211_IER_AIE |
 			       ADM8211_IER_RCIE | ADM8211_IER_TCIE |
 			       ADM8211_IER_TDUIE | ADM8211_IER_GPTIE);
+	priv->mode = IEEE80211_IF_TYPE_MNTR;
 	adm8211_update_mode(dev);
 	ADM8211_CSR_WRITE(RDR, 0);
 
@@ -1554,6 +1555,7 @@ static void adm8211_stop(struct ieee80211_hw *dev)
 {
 	struct adm8211_priv *priv = dev->priv;
 
+	priv->mode = IEEE80211_IF_TYPE_MGMT;
 	priv->nar = 0;
 	ADM8211_CSR_WRITE(NAR, 0);
 	ADM8211_CSR_WRITE(IER, 0);
@@ -1896,7 +1898,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
 	priv->tx_power = 0x40;
 	priv->lpf_cutoff = 0xFF;
 	priv->lnags_threshold = 0xFF;
-	priv->mode = IEEE80211_IF_TYPE_MNTR;
+	priv->mode = IEEE80211_IF_TYPE_MGMT;
 
 	/* Power-on issue. EEPROM won't read correctly without */
 	if (pdev->revision >= ADM8211_REV_BA) {
@@ -1991,7 +1993,7 @@ static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state)
 	struct ieee80211_hw *dev = pci_get_drvdata(pdev);
 	struct adm8211_priv *priv = dev->priv;
 
-	if (priv->mode != IEEE80211_IF_TYPE_MNTR) {
+	if (priv->mode != IEEE80211_IF_TYPE_MGMT) {
 		ieee80211_stop_queues(dev);
 		adm8211_stop(dev);
 	}
@@ -2009,7 +2011,7 @@ static int adm8211_resume(struct pci_dev *pdev)
 	pci_set_power_state(pdev, PCI_D0);
 	pci_restore_state(pdev);
 
-	if (priv->mode != IEEE80211_IF_TYPE_MNTR) {
+	if (priv->mode != IEEE80211_IF_TYPE_MGMT) {
 		adm8211_start(dev);
 		ieee80211_start_queues(dev);
 	}