Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a0b3b08 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: remove unused AMPDU factor/density configuration 



These are unused, so can be removed safely. They also
don't make a lot of sense in Bluetooth configuration.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 69a679b0

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −4
Original line number Diff line number Diff line
@@ -76,11 +76,7 @@ static void iwl_init_ht_hw_capab(const struct iwl_priv *priv, 
		ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;



	ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;

	if (cfg(priv)->bt_params && cfg(priv)->bt_params->ampdu_factor)

		ht_info->ampdu_factor = cfg(priv)->bt_params->ampdu_factor;

	ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;

	if (cfg(priv)->bt_params && cfg(priv)->bt_params->ampdu_density)

		ht_info->ampdu_density = cfg(priv)->bt_params->ampdu_density;



	ht_info->mcs.rx_mask[0] = 0xFF;

	if (rx_chains_num >= 2)

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −4
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ struct iwl_base_params { 
 * @bt_init_traffic_load: specify initial bt traffic load

 * @bt_prio_boost: default bt priority boost value

 * @agg_time_limit: maximum number of uSec in aggregation

 * @ampdu_factor: Maximum A-MPDU length factor

 * @ampdu_density: Minimum A-MPDU spacing

 * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode

 */

struct iwl_bt_params {
@@ -151,8 +149,6 @@ struct iwl_bt_params { 
	u8 bt_init_traffic_load;

	u8 bt_prio_boost;

	u16 agg_time_limit;

	u8 ampdu_factor;

	u8 ampdu_density;

	bool bt_sco_disable;

	bool bt_session_2;

};