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

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

Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next 



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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-fw.h
parents dcad8e42 5ac6c72e

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

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ enum iwl_ucode_tlv_api { 
 * @IWL_UCODE_TLV_CAPA_DQA_SUPPORT: supports dynamic queue allocation (DQA),

 *	which also implies support for the scheduler configuration command

 * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching

 * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command

 */

enum iwl_ucode_tlv_capa {

	IWL_UCODE_TLV_CAPA_D0I3_SUPPORT			= BIT(0),
@@ -169,6 +170,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_QUIET_PERIOD_SUPPORT		= BIT(11),

	IWL_UCODE_TLV_CAPA_DQA_SUPPORT			= BIT(12),

	IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH		= BIT(13),

	IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT		= BIT(18),

};



/* The default calibrate table size if not specified by firmware file */

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

+9 −3
Original line number Diff line number Diff line
@@ -2577,10 +2577,16 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw, 


	switch (vif->type) {

	case NL80211_IFTYPE_STATION:

		if (mvm->fw->ucode_capa.capa[0] &

		    IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT) {

			/* Use aux roc framework (HS20) */

			ret = iwl_mvm_send_aux_roc_cmd(mvm, channel,

						       vif, duration);

			goto out_unlock;

		}

		IWL_ERR(mvm, "hotspot not supported\n");

		ret = -EINVAL;

		goto out_unlock;

	case NL80211_IFTYPE_P2P_DEVICE:

		/* handle below */

		break;