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

Commit dc9a1929 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT flag 



All the supported firmwares have this flag set.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 536a3eee

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,6 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_P2P_PM		= BIT(21),

	IWL_UCODE_TLV_FLAGS_P2P_PM		= BIT(21),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM	= BIT(22),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_DCM	= BIT(22),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_SCM	= BIT(23),

	IWL_UCODE_TLV_FLAGS_BSS_P2P_PS_SCM	= BIT(23),

	IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT	= BIT(24),

	IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD	= BIT(26),

	IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD	= BIT(26),

	IWL_UCODE_TLV_FLAGS_BCAST_FILTERING	= BIT(29),

	IWL_UCODE_TLV_FLAGS_BCAST_FILTERING	= BIT(29),

	IWL_UCODE_TLV_FLAGS_GO_UAPSD		= BIT(30),

	IWL_UCODE_TLV_FLAGS_GO_UAPSD		= BIT(30),

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -276,6 +276,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_TIMING_BEACON_ONLY |

		    IEEE80211_HW_TIMING_BEACON_ONLY |

		    IEEE80211_HW_CONNECTION_MONITOR |

		    IEEE80211_HW_CONNECTION_MONITOR |

		    IEEE80211_HW_SUPPORTS_UAPSD |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;
@@ -285,6 +286,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
				    IEEE80211_RADIOTAP_MCS_HAVE_STBC;

				    IEEE80211_RADIOTAP_MCS_HAVE_STBC;

	hw->radiotap_vht_details |= IEEE80211_RADIOTAP_VHT_KNOWN_STBC;

	hw->radiotap_vht_details |= IEEE80211_RADIOTAP_VHT_KNOWN_STBC;

	hw->rate_control_algorithm = "iwl-mvm-rs";

	hw->rate_control_algorithm = "iwl-mvm-rs";

	hw->uapsd_queues = IWL_UAPSD_AC_INFO;

	hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;





	/*

	/*

	 * Enable 11w if advertised by firmware and software crypto

	 * Enable 11w if advertised by firmware and software crypto
@@ -295,11 +298,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	    !iwlwifi_mod_params.sw_crypto)

	    !iwlwifi_mod_params.sw_crypto)

		hw->flags |= IEEE80211_HW_MFP_CAPABLE;

		hw->flags |= IEEE80211_HW_MFP_CAPABLE;





	if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT) {

	/* Disable uAPSD due to firmware issues */

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

	if (true)

		hw->uapsd_queues = IWL_UAPSD_AC_INFO;

		hw->flags &= ~IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}





	hw->sta_data_size = sizeof(struct iwl_mvm_sta);

	hw->sta_data_size = sizeof(struct iwl_mvm_sta);

	hw->vif_data_size = sizeof(struct iwl_mvm_vif);

	hw->vif_data_size = sizeof(struct iwl_mvm_vif);