Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes (0597a7a1) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -758,7 +758,7 @@ int iwl_alive_start(struct iwl_priv *priv)
		BT_COEX_PRIO_TBL_EVT_INIT_CALIB2);
		if (ret)
		return ret;
		} else {
		} else if (priv->lib->bt_params) {
		/*
		* default is 2-wire BT coexexistence support
		*/

+5 −1

Original line number	Diff line number	Diff line
		@@ -988,7 +988,11 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm mvm, struct ieee80211_vif vif)
		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
		char buf[100];

		if (!dbgfs_dir)
		/*
		* Check if debugfs directory already exist before creating it.
		* This may happen when, for example, resetting hw or suspend-resume
		*/
		if (!dbgfs_dir \|\| mvmvif->dbgfs_dir)
		return;

		mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);

+22 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		if (ret)
		return ret;

		return ieee80211_register_hw(mvm->hw);
		ret = ieee80211_register_hw(mvm->hw);
		if (ret)
		iwl_mvm_leds_exit(mvm);

		return ret;
		}

		static void iwl_mvm_mac_tx(struct ieee80211_hw *hw,
		@@ -385,6 +389,7 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
		ieee80211_wake_queues(mvm->hw);

		mvm->vif_count = 0;
		mvm->rx_ba_sessions = 0;
		}

		static int iwl_mvm_mac_start(struct ieee80211_hw *hw)
		@@ -1006,6 +1011,21 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
		mutex_lock(&mvm->mutex);
		if (old_state == IEEE80211_STA_NOTEXIST &&
		new_state == IEEE80211_STA_NONE) {
		/*
		* Firmware bug - it'll crash if the beacon interval is less
		* than 16. We can't avoid connecting at all, so refuse the
		* station state change, this will cause mac80211 to abandon
		* attempts to connect to this AP, and eventually wpa_s will
		* blacklist the AP...
		*/
		if (vif->type == NL80211_IFTYPE_STATION &&
		vif->bss_conf.beacon_int < 16) {
		IWL_ERR(mvm,
		"AP %pM beacon interval is %d, refusing due to firmware bug!\n",
		sta->addr, vif->bss_conf.beacon_int);
		ret = -EINVAL;
		goto out_unlock;
		}
		ret = iwl_mvm_add_sta(mvm, vif, sta);
		} else if (old_state == IEEE80211_STA_NONE &&
		new_state == IEEE80211_STA_AUTH) {
		@@ -1038,6 +1058,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
		} else {
		ret = -EIO;
		}
		out_unlock:
		mutex_unlock(&mvm->mutex);

		return ret;

+1 −0

Original line number	Diff line number	Diff line
		@@ -419,6 +419,7 @@ struct iwl_mvm {
		struct work_struct sta_drained_wk;
		unsigned long sta_drained[BITS_TO_LONGS(IWL_MVM_STATION_COUNT)];
		atomic_t pending_frames[IWL_MVM_STATION_COUNT];
		u8 rx_ba_sessions;

		/* configured by mac80211 */
		u32 rts_threshold;

+6 −4

Original line number	Diff line number	Diff line
		@@ -137,8 +137,8 @@ static void iwl_mvm_scan_fill_ssids(struct iwl_scan_cmd *cmd,
		{
		int fw_idx, req_idx;

		fw_idx = 0;
		for (req_idx = req->n_ssids - 1; req_idx > 0; req_idx--) {
		for (req_idx = req->n_ssids - 1, fw_idx = 0; req_idx > 0;
		req_idx--, fw_idx++) {
		cmd->direct_scan[fw_idx].id = WLAN_EID_SSID;
		cmd->direct_scan[fw_idx].len = req->ssids[req_idx].ssid_len;
		memcpy(cmd->direct_scan[fw_idx].ssid,
		@@ -153,7 +153,9 @@ static void iwl_mvm_scan_fill_ssids(struct iwl_scan_cmd *cmd,
		* just to notify that this scan is active and not passive.
		* In order to notify the FW of the number of SSIDs we wish to scan (including
		* the zero-length one), we need to set the corresponding bits in chan->type,
		* one for each SSID, and set the active bit (first).
		* one for each SSID, and set the active bit (first). The first SSID is already
		* included in the probe template, so we need to set only req->n_ssids - 1 bits
		* in addition to the first bit.
		*/
		static u16 iwl_mvm_get_active_dwell(enum ieee80211_band band, int n_ssids)
		{
		@@ -179,7 +181,7 @@ static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd,
		__le32 chan_type_value;

		if (req->n_ssids > 0)
		chan_type_value = cpu_to_le32(BIT(req->n_ssids + 1) - 1);
		chan_type_value = cpu_to_le32(BIT(req->n_ssids) - 1);
		else
		chan_type_value = SCAN_CHANNEL_TYPE_PASSIVE;