diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-19 16:17:12 -0700 |
commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/b43legacy/phy.c | |
parent | 04da2cf9bb133355b7073be25ef3ce88c8edc135 (diff) | |
parent | 375da53b8e5e3ff2330b66b377e07a6151a93fe5 (diff) | |
download | linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.gz linux-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/b43legacy/phy.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index bed67a54250c..4c9442b16f3f 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c @@ -103,7 +103,7 @@ void b43legacy_phy_lock(struct b43legacy_wldev *dev) if (dev->dev->id.revision < 3) { b43legacy_mac_suspend(dev); } else { - if (!b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_AP)) + if (!b43legacy_is_mode(dev->wl, NL80211_IFTYPE_AP)) b43legacy_power_saving_ctl_bits(dev, -1, 1); } } @@ -118,7 +118,7 @@ void b43legacy_phy_unlock(struct b43legacy_wldev *dev) if (dev->dev->id.revision < 3) { b43legacy_mac_enable(dev); } else { - if (!b43legacy_is_mode(dev->wl, IEEE80211_IF_TYPE_AP)) + if (!b43legacy_is_mode(dev->wl, NL80211_IFTYPE_AP)) b43legacy_power_saving_ctl_bits(dev, -1, -1); } } |