Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (0eeb315b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -1072,8 +1072,12 @@ static int iwl_mvm_mac_ctxt_cmd_ap(struct iwl_mvm *mvm,
		/* Fill the common data for all mac context types */
		iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);

		/* Also enable probe requests to pass */
		cmd.filter_flags \|= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST);
		/*
		* pass probe requests and beacons from other APs (needed
		* for ht protection)
		*/
		cmd.filter_flags \|= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST \|
		MAC_FILTER_IN_BEACON);

		/* Fill the data specific for ap mode */
		iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.ap,
		@@ -1094,6 +1098,13 @@ static int iwl_mvm_mac_ctxt_cmd_go(struct iwl_mvm *mvm,
		/* Fill the common data for all mac context types */
		iwl_mvm_mac_ctxt_cmd_common(mvm, vif, &cmd, action);

		/*
		* pass probe requests and beacons from other APs (needed
		* for ht protection)
		*/
		cmd.filter_flags \|= cpu_to_le32(MAC_FILTER_IN_PROBE_REQUEST \|
		MAC_FILTER_IN_BEACON);

		/* Fill the data specific for GO mode */
		iwl_mvm_mac_ctxt_cmd_fill_ap(mvm, vif, &cmd.go.ap,
		action == FW_CTXT_ACTION_ADD);

+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);