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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 203738e5 2b0a53d5

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

+1 −24
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah) 
	ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);

	ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);

	ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);

	ATH_ALLOC_BANK(ah->addac5416_21,

		       ah->iniAddac.ia_rows * ah->iniAddac.ia_columns);

	ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);



	return 0;
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah) 
	ATH_FREE_BANK(ah->analogBank6Data);

	ATH_FREE_BANK(ah->analogBank6TPCData);

	ATH_FREE_BANK(ah->analogBank7Data);

	ATH_FREE_BANK(ah->addac5416_21);

	ATH_FREE_BANK(ah->bank6Temp);



#undef ATH_FREE_BANK
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah, 
	if (ah->eep_ops->set_addac)

		ah->eep_ops->set_addac(ah, chan);



	if (AR_SREV_5416_22_OR_LATER(ah)) {

	REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites);

	} else {

		struct ar5416IniArray temp;

		u32 addacSize =

			sizeof(u32) * ah->iniAddac.ia_rows *

			ah->iniAddac.ia_columns;



		/* For AR5416 2.0/2.1 */

		memcpy(ah->addac5416_21,

		       ah->iniAddac.ia_array, addacSize);



		/* override CLKDRV value at [row, column] = [31, 1] */

		(ah->addac5416_21)[31 * ah->iniAddac.ia_columns + 1] = 0;



		temp.ia_array = ah->addac5416_21;

		temp.ia_columns = ah->iniAddac.ia_columns;

		temp.ia_rows = ah->iniAddac.ia_rows;

		REG_WRITE_ARRAY(&temp, 1, regWrites);

	}



	REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_INTERNAL_ADDAC);



	ENABLE_REGWRITE_BUFFER(ah);

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

+19 −0
Original line number Diff line number Diff line
@@ -180,6 +180,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah) 
		INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,

			       ARRAY_SIZE(ar5416Addac), 2);

	}



	/* iniAddac needs to be modified for these chips */

	if (AR_SREV_9160(ah) || !AR_SREV_5416_22_OR_LATER(ah)) {

		struct ar5416IniArray *addac = &ah->iniAddac;

		u32 size = sizeof(u32) * addac->ia_rows * addac->ia_columns;

		u32 *data;



		data = kmalloc(size, GFP_KERNEL);

		if (!data)

			return;



		memcpy(data, addac->ia_array, size);

		addac->ia_array = data;



		if (!AR_SREV_5416_22_OR_LATER(ah)) {

			/* override CLKDRV value */

			INI_RA(addac, 31,1) = 0;

		}

	}

}



/* Support for Japan ch.14 (2484) spread */

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ struct ath_hw { 
	u32 *analogBank6Data;

	u32 *analogBank6TPCData;

	u32 *analogBank7Data;

	u32 *addac5416_21;

	u32 *bank6Temp;



	u8 txpower_limit;

drivers/net/wireless/brcm80211/brcmsmac/ampdu.c

+4 −8
Original line number Diff line number Diff line
@@ -1051,17 +1051,13 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
		}

		/* either retransmit or send bar if ack not recd */

		if (!ack_recd) {

			struct ieee80211_tx_rate *txrate =

			    tx_info->status.rates;

			if (retry && (txrate[0].count < (int)retry_limit)) {

			if (retry && (ini->txretry[index] < (int)retry_limit)) {

				ini->txretry[index]++;

				ini->tx_in_transit--;

				/*

				 * Use high prededence for retransmit to

				 * give some punch

				 */

				/* brcms_c_txq_enq(wlc, scb, p,

				 * BRCMS_PRIO_TO_PREC(tid)); */

				brcms_c_txq_enq(wlc, scb, p,

						BRCMS_PRIO_TO_HI_PREC(tid));

			} else {
@@ -1074,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
				    IEEE80211_TX_STAT_AMPDU_NO_BACK;

				skb_pull(p, D11_PHY_HDR_LEN);

				skb_pull(p, D11_TXH_LEN);

				wiphy_err(wiphy, "%s: BA Timeout, seq %d, in_"

					"transit %d\n", "AMPDU status", seq,

					ini->tx_in_transit);

				BCMMSG(wiphy,

				       "BA Timeout, seq %d, in_transit %d\n",

				       seq, ini->tx_in_transit);

				ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,

							    p);

			}

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

+9 −1
Original line number Diff line number Diff line
@@ -1187,6 +1187,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
	unsigned long flags;

	struct iwl_addsta_cmd sta_cmd;

	u8 sta_id = iwlagn_key_sta_id(priv, ctx->vif, sta);

	__le16 key_flags;



	/* if station isn't there, neither is the key */

	if (sta_id == IWL_INVALID_STATION)
@@ -1212,7 +1213,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
		IWL_ERR(priv, "offset %d not used in uCode key table.\n",

			keyconf->hw_key_idx);



	sta_cmd.key.key_flags = STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;

	key_flags = cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);

	key_flags |= STA_KEY_FLG_MAP_KEY_MSK | STA_KEY_FLG_NO_ENC |

		     STA_KEY_FLG_INVALID;



	if (!(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE))

		key_flags |= STA_KEY_MULTICAST_MSK;



	sta_cmd.key.key_flags = key_flags;

	sta_cmd.key.key_offset = WEP_INVALID_OFFSET;

	sta_cmd.sta.modify_mask = STA_MODIFY_KEY_MASK;

	sta_cmd.mode = STA_CONTROL_MODIFY_MSK;