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

Commit 917d083d authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

Merge branch 'iwlwifi-fixes' into iwlwifi-next 



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

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c
parents 8a275bad 46018794

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

+13 −2
Original line number Diff line number Diff line
@@ -1074,8 +1074,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,
@@ -1096,6 +1100,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);

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

+0 −7
Original line number Diff line number Diff line
@@ -329,13 +329,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;

	}



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)

		hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;