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

Commit 71511c86 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

parents 712b24ad 2cddddc5

drivers/net/wireless/iwlwifi/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ config IWLWIFI_LEDS 


config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	depends on m

	default IWLWIFI

	help

	  This is the driver that supports the DVM firmware which is
@@ -60,7 +59,6 @@ config IWLDVM 


config IWLMVM

	tristate "Intel Wireless WiFi MVM Firmware support"

	depends on m

	help

	  This is the driver that supports the MVM firmware which is

	  currently only available for 7260 and 3160 devices.

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#include "commands.h"

#include "power.h"



static bool force_cam;

static bool force_cam = true;

module_param(force_cam, bool, 0644);

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

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

+12 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,13 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	/* recalculate basic rates */

	iwl_calc_basic_rates(priv, ctx);



	/*

	 * force CTS-to-self frames protection if RTS-CTS is not preferred

	 * one aggregation protection method

	 */

	if (!priv->hw_params.use_rts_for_aggregation)

		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;



	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||

	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
	else

		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;



	if (bss_conf->use_cts_prot)

		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;

	else

		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;



	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);



	if (vif->type == NL80211_IFTYPE_AP ||

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

+18 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	9

#define IWL3160_UCODE_API_MAX	9

#define IWL7260_UCODE_API_MAX	10

#define IWL3160_UCODE_API_MAX	10



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

#define IWL7260_UCODE_API_OK	9
@@ -85,6 +85,8 @@ 
#define IWL7260_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3160_NVM_VERSION		0x709

#define IWL3160_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL3165_NVM_VERSION		0x709

#define IWL3165_TX_POWER_VERSION	0xffff /* meaningless */

#define IWL7265_NVM_VERSION		0x0a1d

#define IWL7265_TX_POWER_VERSION	0xffff /* meaningless */
@@ -94,6 +96,9 @@ 
#define IWL3160_FW_PRE "iwlwifi-3160-"

#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"



#define IWL3165_FW_PRE "iwlwifi-3165-"

#define IWL3165_MODULE_FIRMWARE(api) IWL3165_FW_PRE __stringify(api) ".ucode"



#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
@@ -215,6 +220,16 @@ static const struct iwl_pwr_tx_backoff iwl7265_pwr_tx_backoffs[] = { 
	{0},

};



const struct iwl_cfg iwl3165_2ac_cfg = {

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

	.fw_name_pre = IWL3165_FW_PRE,

	IWL_DEVICE_7000,

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265_2ac_cfg = {

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

	.fw_name_pre = IWL7265_FW_PRE,
@@ -247,4 +262,5 @@ const struct iwl_cfg iwl7265_n_cfg = { 


MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3165_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	9

#define IWL8000_UCODE_API_MAX	10



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

#define IWL8000_UCODE_API_OK	8