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

iwlwifi: mvm: fix merge damage 



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

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

+0 −7
Original line number Diff line number Diff line
@@ -303,13 +303,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_UAPSD_AC_INFO;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	hw->sta_data_size = sizeof(struct iwl_mvm_sta);

	hw->vif_data_size = sizeof(struct iwl_mvm_vif);

	hw->chanctx_data_size = sizeof(u16);