diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-12 00:46:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-12 00:46:02 +0200 |
| commit | c65570503716015110350ba1c52a04156df3a455 (patch) | |
| tree | eda3dbe423a85a6bd07aba954f52d2fc6fa4336d /drivers/net/wireless/iwlwifi/iwl-power.h | |
| parent | tg3: Fix DMA mapping leak in tigon3_dma_hwbug_workaround(). (diff) | |
| parent | libertas: Improvements on automatic tx power control via SIOCSIWTXPOW. (diff) | |
| download | linux-c65570503716015110350ba1c52a04156df3a455.tar.xz linux-c65570503716015110350ba1c52a04156df3a455.zip | |
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.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h index aa99f3647def..df484a90ae64 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.h +++ b/drivers/net/wireless/iwlwifi/iwl-power.h @@ -72,7 +72,7 @@ struct iwl_power_mgr { /* final power level that used to calculate final power command */ u8 power_mode; u8 user_power_setting; /* set by user through mac80211 or sysfs */ - u8 system_power_setting; /* set by kernel syatem tools */ + u8 system_power_setting; /* set by kernel system tools */ u8 critical_power_setting; /* set if driver over heated */ u8 is_battery_active; /* DC/AC power */ u8 power_disabled; /* flag to disable using power saving level */ @@ -80,7 +80,7 @@ struct iwl_power_mgr { void iwl_setup_power_deferred_work(struct iwl_priv *priv); void iwl_power_cancel_timeout(struct iwl_priv *priv); -int iwl_power_update_mode(struct iwl_priv *priv, u8 refresh); +int iwl_power_update_mode(struct iwl_priv *priv, bool force); int iwl_power_disable_management(struct iwl_priv *priv, u32 ms); int iwl_power_enable_management(struct iwl_priv *priv); int iwl_power_set_user_mode(struct iwl_priv *priv, u16 mode); |