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

Commit 5f4ef719 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 855df36d c47af22a

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

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ 
#include "commands.h"

#include "power.h"



static bool force_cam;

module_param(force_cam, bool, 0644);

MODULE_PARM_DESC(force_cam, "force continuously aware mode (no power saving at all)");



/*

 * Setting power level allows the card to go to sleep when not busy.

 *
@@ -288,6 +292,11 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, 
	bool enabled = priv->hw->conf.flags & IEEE80211_CONF_PS;

	int dtimper;



	if (force_cam) {

		iwl_power_sleep_cam_cmd(priv, cmd);

		return;

	}



	dtimper = priv->hw->conf.ps_dtim_period ?: 1;



	if (priv->wowlan)

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

+2 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	8

#define IWL8000_UCODE_API_MAX	9



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	8
@@ -119,10 +119,9 @@ const struct iwl_cfg iwl8260_2ac_cfg = { 
	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,

};



const struct iwl_cfg iwl8260_n_cfg = {

const struct iwl_cfg iwl8260_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 8260",

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8000,

drivers/net/wireless/iwlwifi/iwl-config.h

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ extern const struct iwl_cfg iwl7265_2ac_cfg; 
extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl8260_n_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+15 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ static struct iwlwifi_opmode_table { 
	[MVM_OP_MODE] = { .name = "iwlmvm", .ops = NULL },

};



#define IWL_DEFAULT_SCAN_CHANNELS 40



/*

 * struct fw_sec: Just for the image parsing proccess.

 * For the fw storage we are using struct fw_desc.
@@ -565,6 +567,8 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
	}



	drv->fw.ucode_ver = le32_to_cpu(ucode->ver);

	memcpy(drv->fw.human_readable, ucode->human_readable,

	       sizeof(drv->fw.human_readable));

	build = le32_to_cpu(ucode->build);



	if (build)
@@ -819,6 +823,12 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
			if (iwl_store_cscheme(&drv->fw, tlv_data, tlv_len))

				goto invalid_tlv_len;

			break;

		case IWL_UCODE_TLV_N_SCAN_CHANNELS:

			if (tlv_len != sizeof(u32))

				goto invalid_tlv_len;

			capa->n_scan_channels =

				le32_to_cpup((__le32 *)tlv_data);

			break;

		default:

			IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);

			break;
@@ -973,6 +983,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;

	fw->ucode_capa.standard_phy_calibration_size =

			IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;

	fw->ucode_capa.n_scan_channels = IWL_DEFAULT_SCAN_CHANNELS;



	if (!api_ok)

		api_ok = api_max;
@@ -1394,3 +1405,7 @@ module_param_named(power_level, iwlwifi_mod_params.power_level, 
		int, S_IRUGO);

MODULE_PARM_DESC(power_level,

		 "default power save level (range from 1 - 5, default: 1)");



module_param_named(fw_monitor, iwlwifi_mod_params.fw_monitor, bool, S_IRUGO);

MODULE_PARM_DESC(dbgm,

		 "firmware monitor - to debug FW (default: false - needs lots of memory)");

drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c

+0 −1
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, 
	if (cfg->ht_params->ht40_bands & BIT(band)) {

		ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;

		ht_info->cap |= IEEE80211_HT_CAP_SGI_40;

		ht_info->mcs.rx_mask[4] = 0x01;

		max_bit_rate = MAX_BIT_RATE_40_MHZ;

	}