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

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

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



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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/internal.h
parents 36fb9017 aecdc63d

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -438,6 +438,12 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl) 
#define RX_QUEUE_MASK                         255

#define RX_QUEUE_MASK                         255

#define RX_QUEUE_SIZE_LOG                     8

#define RX_QUEUE_SIZE_LOG                     8





/*

 * RX related structures and functions

 */

#define RX_FREE_BUFFERS 64

#define RX_LOW_WATERMARK 8



/**

/**

 * struct iwl_rb_status - reserve buffer status

 * struct iwl_rb_status - reserve buffer status

 * 	host memory mapped FH registers

 * 	host memory mapped FH registers

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -540,13 +540,11 @@ static void iwl_set_hw_address_family_8000(struct device *dev, 
		hw_addr = (const u8 *)(mac_override +

		hw_addr = (const u8 *)(mac_override +

				 MAC_ADDRESS_OVERRIDE_FAMILY_8000);

				 MAC_ADDRESS_OVERRIDE_FAMILY_8000);





		/* The byte order is little endian 16 bit, meaning 214365 */

		/*

		data->hw_addr[0] = hw_addr[1];

		 * Store the MAC address from MAO section.

		data->hw_addr[1] = hw_addr[0];

		 * No byte swapping is required in MAO section

		data->hw_addr[2] = hw_addr[3];

		 */

		data->hw_addr[3] = hw_addr[2];

		memcpy(data->hw_addr, hw_addr, ETH_ALEN);

		data->hw_addr[4] = hw_addr[5];

		data->hw_addr[5] = hw_addr[4];





		/*

		/*

		 * Force the use of the OTP MAC address in case of reserved MAC

		 * Force the use of the OTP MAC address in case of reserved MAC

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -517,7 +517,8 @@ struct iwl_scan_config { 
 * iwl_umac_scan_flags

 * iwl_umac_scan_flags

 *@IWL_UMAC_SCAN_FLAG_PREEMPTIVE: scan process triggered by this scan request

 *@IWL_UMAC_SCAN_FLAG_PREEMPTIVE: scan process triggered by this scan request

 *	can be preempted by other scan requests with higher priority.

 *	can be preempted by other scan requests with higher priority.

 *	The low priority scan is aborted.

 *	The low priority scan will be resumed when the higher proirity scan is

 *	completed.

 *@IWL_UMAC_SCAN_FLAG_START_NOTIF: notification will be sent to the driver

 *@IWL_UMAC_SCAN_FLAG_START_NOTIF: notification will be sent to the driver

 *	when scan starts.

 *	when scan starts.

 */

 */

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -967,7 +967,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm, 
	cmd->scan_priority =

	cmd->scan_priority =

		iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);

		iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);





	if (iwl_mvm_scan_total_iterations(params) == 0)

	if (iwl_mvm_scan_total_iterations(params) == 1)

		cmd->ooc_priority =

		cmd->ooc_priority =

			iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);

			iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);

	else

	else
@@ -1051,6 +1051,9 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	cmd->uid = cpu_to_le32(uid);

	cmd->uid = cpu_to_le32(uid);

	cmd->general_flags = cpu_to_le32(iwl_mvm_scan_umac_flags(mvm, params));

	cmd->general_flags = cpu_to_le32(iwl_mvm_scan_umac_flags(mvm, params));





	if (type == IWL_MVM_SCAN_SCHED)

		cmd->flags = cpu_to_le32(IWL_UMAC_SCAN_FLAG_PREEMPTIVE);



	if (iwl_mvm_scan_use_ebs(mvm, vif, n_iterations))

	if (iwl_mvm_scan_use_ebs(mvm, vif, n_iterations))

		cmd->channel_flags = IWL_SCAN_CHANNEL_FLAG_EBS |

		cmd->channel_flags = IWL_SCAN_CHANNEL_FLAG_EBS |

				     IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

				     IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1414,6 +1414,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
	bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);

	bool mcast = !(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE);

	u8 sta_id;

	u8 sta_id;

	int ret;

	int ret;

	static const u8 __maybe_unused zero_addr[ETH_ALEN] = {0};





	lockdep_assert_held(&mvm->mutex);

	lockdep_assert_held(&mvm->mutex);
@@ -1480,7 +1481,7 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, 
end:

end:

	IWL_DEBUG_WEP(mvm, "key: cipher=%x len=%d idx=%d sta=%pM ret=%d\n",

	IWL_DEBUG_WEP(mvm, "key: cipher=%x len=%d idx=%d sta=%pM ret=%d\n",

		      keyconf->cipher, keyconf->keylen, keyconf->keyidx,

		      keyconf->cipher, keyconf->keylen, keyconf->keyidx,

		      sta->addr, ret);

		      sta ? sta->addr : zero_addr, ret);

	return ret;

	return ret;

}

}