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

Commit cbda794c authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-02-08' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Some patches focusing on bugfixes for v4.11:

  * Fix 802.11w, which was failing to due an IGTK bug;
  * A few more bugzilla bug fixes;
  * A channel-switch race condition fix;
  * Some fixes related to suspend/resume with new HW;
  * The RF-kill saga continues;
  * And some other fixes here and there...
parents 514612fc 0c8d0a47

drivers/net/wireless/intel/iwlwifi/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -90,13 +90,16 @@ config IWLWIFI_BCAST_FILTERING 


config IWLWIFI_PCIE_RTPM

       bool "Enable runtime power management mode for PCIe devices"

       depends on IWLMVM && PM

       depends on IWLMVM && PM && EXPERT

       default false

       help

         Say Y here to enable runtime power management for PCIe

         devices.  If enabled, the device will go into low power mode

         when idle for a short period of time, allowing for improved

         power saving during runtime.

         power saving during runtime. Note that this feature requires

         a tight integration with the platform. It is not recommended

         to enable this feature without proper validation with the

         specific target platform.



	 If unsure, say N.

drivers/net/wireless/intel/iwlwifi/dvm/rs.c

+4 −1
Original line number Diff line number Diff line
@@ -740,7 +740,10 @@ static u16 rs_get_adjacent_rate(struct iwl_priv *priv, u8 index, u16 rate_mask, 


		/* Find the previous rate that is in the rate mask */

		i = index - 1;

		for (mask = (1 << i); i >= 0; i--, mask >>= 1) {

		if (i >= 0)

			mask = BIT(i);



		for (; i >= 0; i--, mask >>= 1) {

			if (rate_mask & mask) {

				low = i;

				break;

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+8 −12
Original line number Diff line number Diff line
@@ -1396,19 +1396,15 @@ void iwl_mvm_rx_mfuart_notif(struct iwl_mvm *mvm, 
	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_mfuart_load_notif *mfuart_notif = (void *)pkt->data;



	if (iwl_rx_packet_payload_len(pkt) == sizeof(*mfuart_notif))

		IWL_DEBUG_INFO(mvm,

			       "MFUART: installed ver: 0x%08x, external ver: 0x%08x, status: 0x%08x, duration: 0x%08x, image size: 0x%08x\n",

			       le32_to_cpu(mfuart_notif->installed_ver),

			       le32_to_cpu(mfuart_notif->external_ver),

			       le32_to_cpu(mfuart_notif->status),

			       le32_to_cpu(mfuart_notif->duration),

			       le32_to_cpu(mfuart_notif->image_size));

	else

	IWL_DEBUG_INFO(mvm,

		       "MFUART: installed ver: 0x%08x, external ver: 0x%08x, status: 0x%08x, duration: 0x%08x\n",

		       le32_to_cpu(mfuart_notif->installed_ver),

		       le32_to_cpu(mfuart_notif->external_ver),

		       le32_to_cpu(mfuart_notif->status),

		       le32_to_cpu(mfuart_notif->duration));



	if (iwl_rx_packet_payload_len(pkt) == sizeof(*mfuart_notif))

		IWL_DEBUG_INFO(mvm,

			       "MFUART: image size: 0x%08x\n",

			       le32_to_cpu(mfuart_notif->image_size));

}

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

+7 −8
Original line number Diff line number Diff line
@@ -2008,16 +2008,16 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, 
		if (fw_has_capa(&mvm->fw->ucode_capa,

				IWL_UCODE_TLV_CAPA_UMAC_SCAN))

			iwl_mvm_config_scan(mvm);

	} else if (changes & BSS_CHANGED_BEACON_INFO) {

	}



	if (changes & BSS_CHANGED_BEACON_INFO) {

		/*

		 * We received a beacon _after_ association so

		 * We received a beacon from the associated AP so

		 * remove the session protection.

		 */

		iwl_mvm_remove_time_event(mvm, mvmvif,

					  &mvmvif->time_event_data);

	}



	if (changes & BSS_CHANGED_BEACON_INFO) {

		iwl_mvm_sf_update(mvm, vif, false);

		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));

	}
@@ -2627,11 +2627,10 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw, 
			mvmvif->ap_assoc_sta_count++;

			iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);

		}

		ret = iwl_mvm_update_sta(mvm, vif, sta);

		if (ret == 0)

			iwl_mvm_rs_rate_init(mvm, sta,

					     mvmvif->phy_ctxt->channel->band,



		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,

				     true);

		ret = iwl_mvm_update_sta(mvm, vif, sta);

	} else if (old_state == IEEE80211_STA_ASSOC &&

		   new_state == IEEE80211_STA_AUTHORIZED) {

drivers/net/wireless/intel/iwlwifi/mvm/rs.c

+5 −1
Original line number Diff line number Diff line
@@ -972,7 +972,9 @@ static u16 rs_get_adjacent_rate(struct iwl_mvm *mvm, u8 index, u16 rate_mask, 


		/* Find the previous rate that is in the rate mask */

		i = index - 1;

		for (mask = (1 << i); i >= 0; i--, mask >>= 1) {

		if (i >= 0)

			mask = BIT(i);

		for (; i >= 0; i--, mask >>= 1) {

			if (rate_mask & mask) {

				low = i;

				break;
@@ -3616,6 +3618,8 @@ int rs_pretty_print_rate(char *buf, const u32 rate) 
	} else if (rate & RATE_MCS_HT_MSK) {

		type = "HT";

		mcs = rate & RATE_HT_MCS_INDEX_MSK;

		nss = ((rate & RATE_HT_MCS_NSS_MSK)

		       >> RATE_HT_MCS_NSS_POS) + 1;

	} else {

		type = "Unknown"; /* shouldn't happen */

	}