iwlagn: all _agn devices support power save mode
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 1 Apr 2011 23:29:53 +0000 (16:29 -0700)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 8 Apr 2011 15:01:46 +0000 (08:01 -0700)
Remove broken_power_save checking

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-debugfs.c
drivers/net/wireless/iwlwifi/iwl-power.c

index 60bfde75ce87016604d56d880e054c2c9ec03b12..23b89c2e71dad28b3b15d4ebab2d59f3002967b0 100644 (file)
@@ -2828,9 +2828,8 @@ static int iwl_mac_setup_register(struct iwl_priv *priv,
 
        hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
 
-       if (!priv->cfg->base_params->broken_powersave)
-               hw->flags |= IEEE80211_HW_SUPPORTS_PS |
-                            IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
+       hw->flags |= IEEE80211_HW_SUPPORTS_PS |
+                    IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
 
        if (priv->cfg->sku & IWL_SKU_N)
                hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
index 7d303acc837c4bbe9f77aafe87b615e5c8323aae..a0530d03b30106c1d3710e4185f63682b9856d43 100644 (file)
@@ -269,7 +269,6 @@ struct iwl_base_params {
        const u16 max_ll_items;
        const bool shadow_ram_support;
        u16 led_compensation;
-       const bool broken_powersave;
        int chain_noise_num_beacons;
        bool adv_thermal_throttle;
        bool support_ct_kill_exit;
index 93a86998a3b1d79ee691320355725c1d5567bf7f..2c58980f2d064b8150c47712326a529dec138115 100644 (file)
@@ -1723,11 +1723,8 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)
        DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);
        DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);
        DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR);
-       if (!priv->cfg->base_params->broken_powersave) {
-               DEBUGFS_ADD_FILE(sleep_level_override, dir_data,
-                                S_IWUSR | S_IRUSR);
-               DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR);
-       }
+       DEBUGFS_ADD_FILE(sleep_level_override, dir_data, S_IWUSR | S_IRUSR);
+       DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR);
        DEBUGFS_ADD_FILE(thermal_throttling, dir_data, S_IRUSR);
        DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);
        DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR);
index c43c8e66de73cd9a1de0f9435b0fa59d68e5219b..ae176d8da9e8cb174f3c1d6b680da185800e9a5d 100644 (file)
@@ -354,9 +354,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
 
        dtimper = priv->hw->conf.ps_dtim_period ?: 1;
 
-       if (priv->cfg->base_params->broken_powersave)
-               iwl_power_sleep_cam_cmd(priv, cmd);
-       else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE)
+       if (priv->hw->conf.flags & IEEE80211_CONF_IDLE)
                iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20);
        else if (priv->cfg->ops->lib->tt_ops.lower_power_detection &&
                 priv->cfg->ops->lib->tt_ops.tt_power_mode &&