diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-10 18:01:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-15 16:48:23 -0400 |
commit | 05c914fe330fa8e1cc67870dc0d3809dfd96c107 (patch) | |
tree | df53bcab47335f3361c09478d6b1447b7d298536 /drivers/net/wireless/p54/p54pci.c | |
parent | 96dd22ac06b0dbfb069fdf530c72046a941e9694 (diff) |
mac80211: use nl80211 interface types
There's really no reason for mac80211 to be using its
own interface type defines. Use the nl80211 types and
simplify the configuration code a bit: there's no need
to translate them any more now.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.c')
-rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index 1594786205f8..1c2a02a741af 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c | |||
@@ -616,7 +616,7 @@ static int p54p_suspend(struct pci_dev *pdev, pm_message_t state) | |||
616 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); | 616 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); |
617 | struct p54p_priv *priv = dev->priv; | 617 | struct p54p_priv *priv = dev->priv; |
618 | 618 | ||
619 | if (priv->common.mode != IEEE80211_IF_TYPE_INVALID) { | 619 | if (priv->common.mode != NL80211_IFTYPE_UNSPECIFIED) { |
620 | ieee80211_stop_queues(dev); | 620 | ieee80211_stop_queues(dev); |
621 | p54p_stop(dev); | 621 | p54p_stop(dev); |
622 | } | 622 | } |
@@ -634,7 +634,7 @@ static int p54p_resume(struct pci_dev *pdev) | |||
634 | pci_set_power_state(pdev, PCI_D0); | 634 | pci_set_power_state(pdev, PCI_D0); |
635 | pci_restore_state(pdev); | 635 | pci_restore_state(pdev); |
636 | 636 | ||
637 | if (priv->common.mode != IEEE80211_IF_TYPE_INVALID) { | 637 | if (priv->common.mode != NL80211_IFTYPE_UNSPECIFIED) { |
638 | p54p_open(dev); | 638 | p54p_open(dev); |
639 | ieee80211_wake_queues(dev); | 639 | ieee80211_wake_queues(dev); |
640 | } | 640 | } |