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

Commit 9b8ba9f5 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents b6251243 acfcd9ed

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+5 −2
Original line number Diff line number Diff line
@@ -872,8 +872,11 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	lockdep_assert_held(&mvm->mutex);



	/* Rssi update while not associated ?! */

	if (WARN_ON_ONCE(mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT))

	/*

	 * Rssi update while not associated - can happen since the statistics

	 * are handled asynchronously

	 */

	if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)

		return;



	/* No BT - reports should be disabled */

drivers/net/wireless/iwlwifi/pcie/drv.c

+2 −3
Original line number Diff line number Diff line
@@ -359,13 +359,12 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
/* 7265 Series */

	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5110, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5112, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5100, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x510A, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5310, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5302, iwl7265_n_cfg)},

	{IWL_PCI_DEVICE(0x095B, 0x5210, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5012, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5412, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5410, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x5400, iwl7265_2ac_cfg)},

	{IWL_PCI_DEVICE(0x095A, 0x1010, iwl7265_2ac_cfg)},