diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-01 19:29:53 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-04-08 11:01:46 -0400 |
commit | 23c0fcc66b4345ea97ae588c2e01f10c994652ba (patch) | |
tree | 31fea2ed224f57e673dd9c7a2e2e6a100f534e31 | |
parent | 8ff84a2c99bc7f5f22d9d2b5365d821ce4f7a8f9 (diff) |
iwlagn: all _agn devices support power save mode
Remove broken_power_save checking
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 60bfde75ce87..23b89c2e71da 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2828,9 +2828,8 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, | |||
2828 | 2828 | ||
2829 | hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF; | 2829 | hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF; |
2830 | 2830 | ||
2831 | if (!priv->cfg->base_params->broken_powersave) | 2831 | hw->flags |= IEEE80211_HW_SUPPORTS_PS | |
2832 | hw->flags |= IEEE80211_HW_SUPPORTS_PS | | 2832 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; |
2833 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; | ||
2834 | 2833 | ||
2835 | if (priv->cfg->sku & IWL_SKU_N) | 2834 | if (priv->cfg->sku & IWL_SKU_N) |
2836 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | | 2835 | hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 7d303acc837c..a0530d03b301 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -269,7 +269,6 @@ struct iwl_base_params { | |||
269 | const u16 max_ll_items; | 269 | const u16 max_ll_items; |
270 | const bool shadow_ram_support; | 270 | const bool shadow_ram_support; |
271 | u16 led_compensation; | 271 | u16 led_compensation; |
272 | const bool broken_powersave; | ||
273 | int chain_noise_num_beacons; | 272 | int chain_noise_num_beacons; |
274 | bool adv_thermal_throttle; | 273 | bool adv_thermal_throttle; |
275 | bool support_ct_kill_exit; | 274 | bool support_ct_kill_exit; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 93a86998a3b1..2c58980f2d06 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -1723,11 +1723,8 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
1723 | DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR); | 1723 | DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR); |
1724 | DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR); | 1724 | DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR); |
1725 | DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR); | 1725 | DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR); |
1726 | if (!priv->cfg->base_params->broken_powersave) { | 1726 | DEBUGFS_ADD_FILE(sleep_level_override, dir_data, S_IWUSR | S_IRUSR); |
1727 | DEBUGFS_ADD_FILE(sleep_level_override, dir_data, | 1727 | DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR); |
1728 | S_IWUSR | S_IRUSR); | ||
1729 | DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR); | ||
1730 | } | ||
1731 | DEBUGFS_ADD_FILE(thermal_throttling, dir_data, S_IRUSR); | 1728 | DEBUGFS_ADD_FILE(thermal_throttling, dir_data, S_IRUSR); |
1732 | DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR); | 1729 | DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR); |
1733 | DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR); | 1730 | DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index c43c8e66de73..ae176d8da9e8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -354,9 +354,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, | |||
354 | 354 | ||
355 | dtimper = priv->hw->conf.ps_dtim_period ?: 1; | 355 | dtimper = priv->hw->conf.ps_dtim_period ?: 1; |
356 | 356 | ||
357 | if (priv->cfg->base_params->broken_powersave) | 357 | if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) |
358 | iwl_power_sleep_cam_cmd(priv, cmd); | ||
359 | else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) | ||
360 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); | 358 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); |
361 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && | 359 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && |
362 | priv->cfg->ops->lib->tt_ops.tt_power_mode && | 360 | priv->cfg->ops->lib->tt_ops.tt_power_mode && |