Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (3e3cb6ca) · Commits · 戴 / test

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -252,13 +252,17 @@ static void iwl_bg_bt_runtime_config(struct work_struct *work)
		struct iwl_priv *priv =
		container_of(work, struct iwl_priv, bt_runtime_config);

		mutex_lock(&priv->mutex);
		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
		return;
		goto out;

		/* dont send host command if rf-kill is on */
		if (!iwl_is_ready_rf(priv))
		return;
		goto out;

		iwlagn_send_advance_bt_config(priv);
		out:
		mutex_unlock(&priv->mutex);
		}

		static void iwl_bg_bt_full_concurrency(struct work_struct *work)

+5 −2

Original line number	Diff line number	Diff line
		@@ -906,8 +906,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 */

+2 −3

Original line number	Diff line number	Diff line
		@@ -360,13 +360,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)},