Commit 5d22df20 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
parents 8b1fdb53 78feb35b

drivers/net/wireless/ath/ath9k/main.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) 
			ath_start_ani(common);

	}



	if (ath9k_hw_ops(ah)->antdiv_comb_conf_get && sc->ant_rx != 3) {

	if ((ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) && sc->ant_rx != 3) {

		struct ath_hw_antcomb_conf div_ant_conf;

		u8 lna_conf;

drivers/net/wireless/ath/ath9k/rc.c

+3 −1
Original line number Diff line number Diff line
@@ -1271,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc, 


	ath_rc_priv->max_valid_rate = k;

	ath_rc_sort_validrates(rate_table, ath_rc_priv);

	ath_rc_priv->rate_max_phy = ath_rc_priv->valid_rate_index[k-4];

	ath_rc_priv->rate_max_phy = (k > 4) ?

					ath_rc_priv->valid_rate_index[k-4] :

					ath_rc_priv->valid_rate_index[k-1];

	ath_rc_priv->rate_table = rate_table;



	ath_dbg(common, ATH_DBG_CONFIG,

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+2 −2
Original line number Diff line number Diff line
@@ -610,8 +610,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
			if (ctx->ht.enabled) {

				/* if HT40 is used, it should not change

				 * after associated except channel switch */

				if (iwl_is_associated_ctx(ctx) &&

				     !ctx->ht.is_40mhz)

				if (!ctx->ht.is_40mhz ||

						!iwl_is_associated_ctx(ctx))

					iwlagn_config_ht40(conf, ctx);

			} else

				ctx->ht.is_40mhz = false;

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+4 −1
Original line number Diff line number Diff line
@@ -91,7 +91,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, 
		tx_cmd->tid_tspec = qc[0] & 0xf;

		tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;

	} else {

		if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)

			tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;

		else

			tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;

	}



	iwlagn_tx_cmd_protection(priv, info, fc, &tx_flags);

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

+6 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw, 
	int ret;

	u8 sta_id;



	if (ctx->ctxid != IWL_RXON_CTX_PAN)

		return 0;



	IWL_DEBUG_MAC80211(priv, "enter\n");

	mutex_lock(&priv->shrd->mutex);
@@ -1097,6 +1100,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw, 
	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;

	struct iwl_rxon_context *ctx = vif_priv->ctx;



	if (ctx->ctxid != IWL_RXON_CTX_PAN)

		return;



	IWL_DEBUG_MAC80211(priv, "enter\n");

	mutex_lock(&priv->shrd->mutex);