diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-28 08:01:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:15 -0400 |
commit | a28975525016ddcbdaab8225666df1cf2dc9cb2d (patch) | |
tree | 5043b4c24c3c6c40d3d844259e2c47421204436d /drivers/net/wireless/adm8211.c | |
parent | f7c4daed99fba15e4e48df464031f4ac7c32e4c9 (diff) |
[MAC80211]: add "invalid" interface type
Since I cannot convince the lazy driver authors (hello Michael)
to stop (ab)using the MGMT interface type internally in their
drivers, this patch introduces a new _INVALID type especially
for their use and changes all affected drivers to use it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
-rw-r--r-- | drivers/net/wireless/adm8211.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index e4fdadb52503..5bf7913aadda 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -1555,7 +1555,7 @@ static void adm8211_stop(struct ieee80211_hw *dev) | |||
1555 | { | 1555 | { |
1556 | struct adm8211_priv *priv = dev->priv; | 1556 | struct adm8211_priv *priv = dev->priv; |
1557 | 1557 | ||
1558 | priv->mode = IEEE80211_IF_TYPE_MGMT; | 1558 | priv->mode = IEEE80211_IF_TYPE_INVALID; |
1559 | priv->nar = 0; | 1559 | priv->nar = 0; |
1560 | ADM8211_CSR_WRITE(NAR, 0); | 1560 | ADM8211_CSR_WRITE(NAR, 0); |
1561 | ADM8211_CSR_WRITE(IER, 0); | 1561 | ADM8211_CSR_WRITE(IER, 0); |
@@ -1898,7 +1898,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, | |||
1898 | priv->tx_power = 0x40; | 1898 | priv->tx_power = 0x40; |
1899 | priv->lpf_cutoff = 0xFF; | 1899 | priv->lpf_cutoff = 0xFF; |
1900 | priv->lnags_threshold = 0xFF; | 1900 | priv->lnags_threshold = 0xFF; |
1901 | priv->mode = IEEE80211_IF_TYPE_MGMT; | 1901 | priv->mode = IEEE80211_IF_TYPE_INVALID; |
1902 | 1902 | ||
1903 | /* Power-on issue. EEPROM won't read correctly without */ | 1903 | /* Power-on issue. EEPROM won't read correctly without */ |
1904 | if (pdev->revision >= ADM8211_REV_BA) { | 1904 | if (pdev->revision >= ADM8211_REV_BA) { |
@@ -1993,7 +1993,7 @@ static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1993 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); | 1993 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); |
1994 | struct adm8211_priv *priv = dev->priv; | 1994 | struct adm8211_priv *priv = dev->priv; |
1995 | 1995 | ||
1996 | if (priv->mode != IEEE80211_IF_TYPE_MGMT) { | 1996 | if (priv->mode != IEEE80211_IF_TYPE_INVALID) { |
1997 | ieee80211_stop_queues(dev); | 1997 | ieee80211_stop_queues(dev); |
1998 | adm8211_stop(dev); | 1998 | adm8211_stop(dev); |
1999 | } | 1999 | } |
@@ -2011,7 +2011,7 @@ static int adm8211_resume(struct pci_dev *pdev) | |||
2011 | pci_set_power_state(pdev, PCI_D0); | 2011 | pci_set_power_state(pdev, PCI_D0); |
2012 | pci_restore_state(pdev); | 2012 | pci_restore_state(pdev); |
2013 | 2013 | ||
2014 | if (priv->mode != IEEE80211_IF_TYPE_MGMT) { | 2014 | if (priv->mode != IEEE80211_IF_TYPE_INVALID) { |
2015 | adm8211_start(dev); | 2015 | adm8211_start(dev); |
2016 | ieee80211_start_queues(dev); | 2016 | ieee80211_start_queues(dev); |
2017 | } | 2017 | } |