| Message ID | 20221120185147.d82e3d7bf651.Ie4d90c376c822694f4523ff0fb5731f20004c24d@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Gregory Greenman |
| Headers | show |
| Series | wifi: iwlwifi: updates intended for v6.2 2022-11-20 | expand |
gregory.greenman@intel.com writes: > From: Mordechay Goodstein <mordechay.goodstein@intel.com> > > In 11be we can receive 1K aggregation size so update our max HW rx > aggregation for mac80211 usage. > > Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com> > Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> > --- > drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c > index 9699433137bc..310eb3fde386 100644 > --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c > @@ -1077,6 +1077,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, > static const u8 no_reclaim_cmds[] = { > TX_CMD, > }; > + u32 max_agg = trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ ? > + IEEE80211_MAX_AMPDU_BUF_EHT : IEEE80211_MAX_AMPDU_BUF_HE; IMHO a proper if statement is cleaner than this.
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index 9699433137bc..310eb3fde386 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -1077,6 +1077,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, static const u8 no_reclaim_cmds[] = { TX_CMD, }; + u32 max_agg = trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ ? + IEEE80211_MAX_AMPDU_BUF_EHT : IEEE80211_MAX_AMPDU_BUF_HE; size_t scan_size; u32 min_backoff; struct iwl_mvm_csme_conn_info *csme_conn_info __maybe_unused; @@ -1098,12 +1100,12 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, if (!hw) return NULL; - hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE; + hw->max_rx_aggregation_subframes = max_agg; if (cfg->max_tx_agg_size) hw->max_tx_aggregation_subframes = cfg->max_tx_agg_size; else - hw->max_tx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE; + hw->max_tx_aggregation_subframes = max_agg; op_mode = hw->priv;