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/iwlwifi/iwl-power.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/iwlwifi/iwl-power.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 55ec31ec9e15..60a03d2d2d0e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c @@ -290,7 +290,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force) final_mode = setting->critical_power_setting; /* driver only support CAM for non STA network */ - if (priv->iw_mode != IEEE80211_IF_TYPE_STA) + if (priv->iw_mode != NL80211_IFTYPE_STATION) final_mode = IWL_POWER_MODE_CAM; if (!iwl_is_rfkill(priv) && !setting->power_disabled && |