diff options
| author | Don Fry <donald.h.fry@intel.com> | 2012-03-15 16:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 16:37:49 -0400 |
| commit | 47107e84446f4724d25c724493679cc50eeef53c (patch) | |
| tree | 79995db57fc8d1d4e4a8ba07bfd29afb8df51bc7 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |
| parent | 17acd0b64e23d92013621dc2caa3042ce6769770 (diff) | |
iwlwifi: split POWER_PMI status bit
Move the POWER_PMI to the op_mode where it is changed. The trans needs
to check it frequently, so shadow the status in the trans and update it
in trans when it infrequently changes.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 180df01d0916..4da4ab23cce7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
| @@ -856,7 +856,7 @@ static u8 iwl_count_chain_bitmap(u32 chain_bitmap) | |||
| 856 | void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx) | 856 | void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx) |
| 857 | { | 857 | { |
| 858 | bool is_single = is_single_rx_stream(priv); | 858 | bool is_single = is_single_rx_stream(priv); |
| 859 | bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->shrd->status); | 859 | bool is_cam = !test_bit(STATUS_POWER_PMI, &priv->status); |
| 860 | u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt; | 860 | u8 idle_rx_cnt, active_rx_cnt, valid_rx_cnt; |
| 861 | u32 active_chains; | 861 | u32 active_chains; |
| 862 | u16 rx_chain; | 862 | u16 rx_chain; |