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

Commit 3b924ea1 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents ab09b95c 2cddddc5

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/iwl-7000.c

+16 −0
Original line number Diff line number Diff line
@@ -83,6 +83,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 */
@@ -92,6 +94,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"
@@ -213,6 +218,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,
@@ -245,4 +260,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-config.h

+3 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ enum iwl_led_mode { 
#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_MAX_WD_TIMEOUT	120000



#define IWL_DEFAULT_MAX_TX_POWER 22



/* Antenna presence definitions */

#define	ANT_NONE	0x0

#define	ANT_A		BIT(0)
@@ -335,6 +337,7 @@ extern const struct iwl_cfg iwl7260_n_cfg; 
extern const struct iwl_cfg iwl3160_2ac_cfg;

extern const struct iwl_cfg iwl3160_2n_cfg;

extern const struct iwl_cfg iwl3160_n_cfg;

extern const struct iwl_cfg iwl3165_2ac_cfg;

extern const struct iwl_cfg iwl7265_2ac_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

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

+1 −3
Original line number Diff line number Diff line
@@ -146,8 +146,6 @@ static const u8 iwl_nvm_channels_family_8000[] = { 
#define LAST_2GHZ_HT_PLUS		9

#define LAST_5GHZ_HT			161



#define DEFAULT_MAX_TX_POWER 16



/* rate data (static) */

static struct ieee80211_rate iwl_cfg80211_rates[] = {

	{ .bitrate = 1 * 10, .hw_value = 0, .hw_value_short = 0, },
@@ -295,7 +293,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 
		 * Default value - highest tx power value.  max_power

		 * is not used in mvm, and is used for backwards compatibility

		 */

		channel->max_power = DEFAULT_MAX_TX_POWER;

		channel->max_power = IWL_DEFAULT_MAX_TX_POWER;

		is_5ghz = channel->band == IEEE80211_BAND_5GHZ;

		IWL_DEBUG_EEPROM(dev,

				 "Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n",

drivers/net/wireless/iwlwifi/mvm/coex.c

+3 −6
Original line number Diff line number Diff line
@@ -585,8 +585,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
	lockdep_assert_held(&mvm->mutex);



	if (unlikely(mvm->bt_force_ant_mode != BT_FORCE_ANT_DIS)) {

		u32 mode;



		switch (mvm->bt_force_ant_mode) {

		case BT_FORCE_ANT_BT:

			mode = BT_COEX_BT;
@@ -756,7 +754,8 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	struct iwl_bt_iterator_data *data = _data;

	struct iwl_mvm *mvm = data->mvm;

	struct ieee80211_chanctx_conf *chanctx_conf;

	enum ieee80211_smps_mode smps_mode;

	/* default smps_mode is AUTOMATIC - only used for client modes */

	enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC;

	u32 bt_activity_grading;

	int ave_rssi;
@@ -764,8 +763,6 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 


	switch (vif->type) {

	case NL80211_IFTYPE_STATION:

		/* default smps_mode for BSS / P2P client is AUTOMATIC */

		smps_mode = IEEE80211_SMPS_AUTOMATIC;

		break;

	case NL80211_IFTYPE_AP:

		if (!mvmvif->ap_ibss_active)
@@ -797,7 +794,7 @@ static void iwl_mvm_bt_notif_iterator(void *_data, u8 *mac, 
	else if (bt_activity_grading >= BT_LOW_TRAFFIC)

		smps_mode = IEEE80211_SMPS_DYNAMIC;



	/* relax SMPS contraints for next association */

	/* relax SMPS constraints for next association */

	if (!vif->bss_conf.assoc)

		smps_mode = IEEE80211_SMPS_AUTOMATIC;