diff options
| author | Johannes Berg | 2012-03-06 22:30:55 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-03-07 19:56:31 +0100 |
| commit | b9ad70da6a7ed166539b188a95e0aef119555e14 (patch) | |
| tree | dd07a1249c09f78494d7fbcf4d1fded81d45c0e0 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
| parent | iwlwifi: use watchdog timeout from hw_params (diff) | |
| download | kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.tar.gz kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.tar.xz kernel-qcow2-linux-b9ad70da6a7ed166539b188a95e0aef119555e14.zip | |
iwlwifi: put use_rts_for_aggregation into hw_params
The hardware config ht_params shouldn't be modified,
so copy the use_rts_for_aggregation parameter into
hw_params and use/modify it there.
Signed-off-by: Johannes Berg <johannes.berg@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-rxon.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 2c5e7ec697e9..e191d394cfa0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -436,8 +436,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) * force CTS-to-self frames protection if RTS-CTS is not preferred * one aggregation protection method */ - if (!(cfg(priv)->ht_params && - cfg(priv)->ht_params->use_rts_for_aggregation)) + if (!hw_params(priv).use_rts_for_aggregation) ctx->staging.flags |= RXON_FLG_SELF_CTS_EN; if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) || |