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

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



John W. Linville says:

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

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

For the mac80211 bits, Johannes says:

"Here are a few fixes for mac80211. One has been discussed for a while
and adds a terminating NUL-byte to the alpha2 sent to userspace, which
shouldn't be necessary but since many places treat it as a string we
couldn't move to just sending two bytes.

In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
fix for the recently introduced RX aggregation offload, a revert for
a broken patch (that luckily didn't really cause any harm) and a small
fix for alignment in debugfs."

For the iwlwifi bits, Emmanuel says:

"I revert a patch that disabled CTS to self in dvm because users
reported issues. The revert is CCed to stable since the offending
patch was sent to stable too. I also bump the firmware API versions
since a new firmware is coming up. On top of that, Marcel fixes a
bug I introduced while fixing a bug in our Kconfig file."

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents de185ab4 1bd3fa7b

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/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

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,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

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

+1 −1
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	9

#define IWL8000_UCODE_API_MAX	10



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

#define IWL8000_UCODE_API_OK	8

include/net/regulatory.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct ieee80211_reg_rule { 
struct ieee80211_regdomain {

	struct rcu_head rcu_head;

	u32 n_reg_rules;

	char alpha2[2];

	char alpha2[3];

	enum nl80211_dfs_regions dfs_region;

	struct ieee80211_reg_rule reg_rules[];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE