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

Commit afc050dd authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2015-10-17' of... 

Merge tag 'wireless-drivers-for-davem-2015-10-17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
iwlwifi:

* mvm: flush fw_dump_wk when mvm fails to start
* mvm: init card correctly on ctkill exit check
* pci: add a few more PCI subvendor IDs for the 7265 series
* fix firmware filename for 3160
* mvm: clear csa countdown when AP is stopped
* mvm: fix D3 firmware PN programming
* dvm: fix D3 firmware PN programming
* mvm: fix D3 CCMP TX PN assignment

rtlwifi:

* rtl8821ae: Fix system lockups on boot
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e277de5f de28a05e

drivers/net/wireless/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw, 
			u8 *pn = seq.ccmp.pn;



			ieee80211_get_key_rx_seq(key, i, &seq);

			aes_sc->pn = cpu_to_le64(

			aes_sc[i].pn = cpu_to_le64(

					(u64)pn[5] |

					((u64)pn[4] << 8) |

					((u64)pn[3] << 16) |

drivers/net/wireless/iwlwifi/iwl-7000.c

+1 −1
Original line number Diff line number Diff line
@@ -348,6 +348,6 @@ const struct iwl_cfg iwl7265d_n_cfg = { 
};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

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

+11 −16
Original line number Diff line number Diff line
@@ -274,18 +274,13 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, 
		break;

	case WLAN_CIPHER_SUITE_CCMP:

		if (sta) {

			u8 *pn = seq.ccmp.pn;

			u64 pn64;



			aes_sc = data->rsc_tsc->all_tsc_rsc.aes.unicast_rsc;

			aes_tx_sc = &data->rsc_tsc->all_tsc_rsc.aes.tsc;



			ieee80211_get_key_tx_seq(key, &seq);

			aes_tx_sc->pn = cpu_to_le64((u64)pn[5] |

						    ((u64)pn[4] << 8) |

						    ((u64)pn[3] << 16) |

						    ((u64)pn[2] << 24) |

						    ((u64)pn[1] << 32) |

						    ((u64)pn[0] << 40));

			pn64 = atomic64_read(&key->tx_pn);

			aes_tx_sc->pn = cpu_to_le64(pn64);

		} else {

			aes_sc = data->rsc_tsc->all_tsc_rsc.aes.multicast_rsc;

		}
@@ -298,7 +293,7 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw, 
			u8 *pn = seq.ccmp.pn;



			ieee80211_get_key_rx_seq(key, i, &seq);

			aes_sc->pn = cpu_to_le64((u64)pn[5] |

			aes_sc[i].pn = cpu_to_le64((u64)pn[5] |

						   ((u64)pn[4] << 8) |

						   ((u64)pn[3] << 16) |

						   ((u64)pn[2] << 24) |
@@ -1453,15 +1448,15 @@ static void iwl_mvm_d3_update_gtks(struct ieee80211_hw *hw, 


		switch (key->cipher) {

		case WLAN_CIPHER_SUITE_CCMP:

			iwl_mvm_aes_sc_to_seq(&sc->aes.tsc, &seq);

			iwl_mvm_set_aes_rx_seq(sc->aes.unicast_rsc, key);

			atomic64_set(&key->tx_pn, le64_to_cpu(sc->aes.tsc.pn));

			break;

		case WLAN_CIPHER_SUITE_TKIP:

			iwl_mvm_tkip_sc_to_seq(&sc->tkip.tsc, &seq);

			iwl_mvm_set_tkip_rx_seq(sc->tkip.unicast_rsc, key);

			ieee80211_set_key_tx_seq(key, &seq);

			break;

		}

		ieee80211_set_key_tx_seq(key, &seq);



		/* that's it for this key */

		return;

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

+2 −2
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	 * abort after reading the nvm in case RF Kill is on, we will complete

	 * the init seq later when RF kill will switch to off

	 */

	if (iwl_mvm_is_radio_killed(mvm)) {

	if (iwl_mvm_is_radio_hw_killed(mvm)) {

		IWL_DEBUG_RF_KILL(mvm,

				  "jump over all phy activities due to RF kill\n");

		iwl_remove_notification(&mvm->notif_wait, &calib_wait);
@@ -736,7 +736,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) 
	ret = iwl_wait_notification(&mvm->notif_wait, &calib_wait,

			MVM_UCODE_CALIB_TIMEOUT);



	if (ret && iwl_mvm_is_radio_killed(mvm)) {

	if (ret && iwl_mvm_is_radio_hw_killed(mvm)) {

		IWL_DEBUG_RF_KILL(mvm, "RFKILL while calibrating.\n");

		ret = 1;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -2388,6 +2388,7 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw, 
		iwl_mvm_remove_time_event(mvm, mvmvif,

					  &mvmvif->time_event_data);

		RCU_INIT_POINTER(mvm->csa_vif, NULL);

		mvmvif->csa_countdown = false;

	}



	if (rcu_access_pointer(mvm->csa_tx_blocked_vif) == vif) {