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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-07-10

Please pull this batch of fixes intended for the 3.16 stream!

For the iwlwifi bits, Emmanuel says:

"I have here 2 patches that disable the usage of CTS to self. This
keeps making trouble to the firmware and is not a really reliable
protection anyway. We may re-enable it in the future, but in rarer
cases. Along with this, I have a fix from Ilan that prevents a
firmware assertion."

On top of that...

Amitkumar Karwar provides an mwifiex fix to properly initialize
(i.e. zero) tx_info/rx_info.

Andrea Merello stops rt2800usb from doing DMA operations on the
stack...yikes!
====================

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

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

+0 −12
Original line number Diff line number Diff line
@@ -1068,13 +1068,6 @@ 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;
@@ -1480,11 +1473,6 @@ 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/mvm/mac-ctxt.c

+2 −3
Original line number Diff line number Diff line
@@ -667,10 +667,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
	if (vif->bss_conf.qos)

		cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);



	if (vif->bss_conf.use_cts_prot) {

	if (vif->bss_conf.use_cts_prot)

		cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);

		cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_SELF_CTS_EN);

	}



	IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",

		       vif->bss_conf.use_cts_prot,

		       vif->bss_conf.ht_operation_mode);

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

+6 −6
Original line number Diff line number Diff line
@@ -1166,8 +1166,12 @@ static void iwl_mvm_bcast_filter_iterator(void *_data, u8 *mac, 


	bcast_mac = &cmd->macs[mvmvif->id];



	/* enable filtering only for associated stations */

	if (vif->type != NL80211_IFTYPE_STATION || !vif->bss_conf.assoc)

	/*

	 * enable filtering only for associated stations, but not for P2P

	 * Clients

	 */

	if (vif->type != NL80211_IFTYPE_STATION || vif->p2p ||

	    !vif->bss_conf.assoc)

		return;



	bcast_mac->default_discard = 1;
@@ -1244,10 +1248,6 @@ static int iwl_mvm_configure_bcast_filter(struct iwl_mvm *mvm, 
	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BCAST_FILTERING))

		return 0;



	/* bcast filtering isn't supported for P2P client */

	if (vif->p2p)

		return 0;



	if (!iwl_mvm_bcast_filter_build_cmd(mvm, &cmd))

		return 0;

drivers/net/wireless/mwifiex/11n_aggr.c

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
	skb_reserve(skb_aggr, headroom + sizeof(struct txpd));

	tx_info_aggr =  MWIFIEX_SKB_TXCB(skb_aggr);



	memset(tx_info_aggr, 0, sizeof(*tx_info_aggr));

	tx_info_aggr->bss_type = tx_info_src->bss_type;

	tx_info_aggr->bss_num = tx_info_src->bss_num;

drivers/net/wireless/mwifiex/cfg80211.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ mwifiex_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	}



	tx_info = MWIFIEX_SKB_TXCB(skb);

	memset(tx_info, 0, sizeof(*tx_info));

	tx_info->bss_num = priv->bss_num;

	tx_info->bss_type = priv->bss_type;

	tx_info->pkt_len = pkt_len;