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

Commit cffc6c4c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-09-11

Please pull this batch of fixes intended for the 3.17 stream:

For the mac80211 bits, Johannes says:

"Two more fixes for mac80211 - one of them addresses a long-standing
issue that we only found when using vendor events more frequently;
the other addresses some bad information being reported in userspace
that people were starting to actually look at."

For the iwlwifi bits, Emmanuel says:

"I re-enable scheduled scan on firmware that contain the fix for
the bug that Linus reported.  A few trivial fixes: endianity issues,
the same DTIM period fix that I did in mac80211.  Eyal fixes a few
issues we identified with EAPOL, we now send them just as if they were
management frames, this solves interrop issues.  Johannes has another
set of trivial fixes, while Luca fixes the way we configure the filters
in the firmware. Last but not least, a new device is added by Oren."

Emmanuel was traveling, resulting in his pull to be a bit larger than
I would have liked to see at this point.  FWIW, I have asked Emmanuel
to be much more strict for any more pull requests in this cycle.

In addition to the above, Sujith Manoharan reverts an earlier ath9k
patch.  The earlier change was found to allow for the device to sleep
too long and miss beacons.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a7f8289d ae0fd635

drivers/net/wireless/ath/ath9k/common-beacon.c

+2 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah, 
				 struct ath9k_beacon_state *bs)

{

	struct ath_common *common = ath9k_hw_common(ah);

	int dtim_intval, sleepduration;

	int dtim_intval;

	u64 tsf;



	/* No need to configure beacon if we are not associated */
@@ -75,7 +75,6 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah, 
	 * last beacon we received (which may be none).

	 */

	dtim_intval = conf->intval * conf->dtim_period;

	sleepduration = ah->hw->conf.listen_interval * conf->intval;



	/*

	 * Pull nexttbtt forward to reflect the current
@@ -113,7 +112,7 @@ int ath9k_cmn_beacon_config_sta(struct ath_hw *ah, 
	 */



	bs->bs_sleepduration = TU_TO_USEC(roundup(IEEE80211_MS_TO_TU(100),

						  sleepduration));

						  conf->intval));

	if (bs->bs_sleepduration > bs->bs_dtimperiod)

		bs->bs_sleepduration = bs->bs_dtimperiod;

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",