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

Commit 3479f74e authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-02-04' of... 

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

Third batch of iwlwifi patches intended for v5.1

* Work on the new debugging infrastructure continues;
* HE radiotap;
* Support for new FW version 44;
* A couple of new FW API changes;
* A bunch of fixes for static analyzer reported issues;
* General bugfixes;
* Other cleanups and small fixes;
parents 22087d65 b998fbbd

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+4 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#include "iwl-config.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	43

#define IWL_22000_UCODE_API_MAX	44



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -220,6 +220,7 @@ const struct iwl_cfg iwl22260_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

};



const struct iwl_cfg killer1650x_2ax_cfg = {
@@ -232,6 +233,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

};



const struct iwl_cfg killer1650w_2ax_cfg = {
@@ -244,6 +246,7 @@ const struct iwl_cfg killer1650w_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

};



/*

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "fw/file.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	43

#define IWL9000_UCODE_API_MAX	44



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	30

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

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright (C) 2018 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -2238,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, 
	buf_size = min(count, sizeof(buf) -  1);

	if (copy_from_user(buf, user_buf, buf_size))

		return -EFAULT;

	if (sscanf(buf, "%d", &event_log_flag) != 1)

	if (sscanf(buf, "%u", &event_log_flag) != 1)

		return -EFAULT;

	if (event_log_flag == 1)

		iwl_dump_nic_event_log(priv, true, NULL);

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

+4 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 *

 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright(c) 2018 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portionhelp of the ieee80211 subsystem header files.
@@ -592,7 +593,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv, 
		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_BAD_KEY_TTAK)

			break;



		/* fall through */

	case RX_RES_STATUS_SEC_TYPE_WEP:

		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_BAD_ICV_MIC) {
@@ -601,6 +602,7 @@ static int iwlagn_set_decrypted_flag(struct iwl_priv *priv, 
			IWL_DEBUG_RX(priv, "Packet destroyed\n");

			return -1;

		}

		/* fall through */

	case RX_RES_STATUS_SEC_TYPE_CCMP:

		if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==

		    RX_RES_STATUS_DECRYPT_OK) {
@@ -729,7 +731,7 @@ static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in) 
			decrypt_out |= RX_RES_STATUS_BAD_KEY_TTAK;

			break;

		}

		/* fall through if TTAK OK */

		/* fall through */

	default:

		if (!(decrypt_in & RX_MPDU_RES_STATUS_ICV_OK))

			decrypt_out |= RX_RES_STATUS_BAD_ICV_MIC;

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

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -418,7 +419,7 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time) 
		limit = (limits[1] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;

		limit /= 2;

		dwell_time = min(limit, dwell_time);

		/* fall through to limit further */

		/* fall through */

	case 1:

		limit = (limits[0] * 98) / 100 - IWL_CHANNEL_TUNE_TIME * 2;

		limit /= n_active;