Commit a1f6d8f7 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:

====================
This is a batch of fixes intended for the 3.6 stream.

Arend van Spriel sends a simple thinko fix to correct a constant,
preventing the setting of an invalid power level.

Colin Ian King gives us a simple allocation failure check to avoid a
NULL pointer dereference.

Felix Fietkau sends another ath9k tx power patch, this time disabling a
feature that has been reported to cause rx problems.

Hante Meuleman provides a pair of endian fixes for brcmfmac.

Larry Finger offers an rtlwifi fix that avoids a system lockup related
to loading the wrong firmware for RTL8188CE devices.

These have been in linux-next for a few days and I think they should be
included in the final 3.6 kernel if possible.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3f0c3c8f 7a253c29

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

+4 −0
Original line number Diff line number Diff line
@@ -2982,6 +2982,10 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah, 
	case EEP_RX_MASK:

		return pBase->txrxMask & 0xf;

	case EEP_PAPRD:

		if (AR_SREV_9462(ah))

			return false;

		if (!ah->config.enable_paprd);

			return false;

		return !!(pBase->featureEnable & BIT(5));

	case EEP_CHAIN_MASK_REDUCE:

		return (pBase->miscConfiguration >> 0x3) & 0x1;

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

+2 −0
Original line number Diff line number Diff line
@@ -1577,6 +1577,8 @@ int ath9k_init_debug(struct ath_hw *ah) 
			    sc->debug.debugfs_phy, sc, &fops_tx_chainmask);

	debugfs_create_file("disable_ani", S_IRUSR | S_IWUSR,

			    sc->debug.debugfs_phy, sc, &fops_disable_ani);

	debugfs_create_bool("paprd", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			    &sc->sc_ah->config.enable_paprd);

	debugfs_create_file("regidx", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

			    sc, &fops_regidx);

	debugfs_create_file("regval", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,

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

+0 −4
Original line number Diff line number Diff line
@@ -2497,10 +2497,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		pCap->rx_status_len = sizeof(struct ar9003_rxs);

		pCap->tx_desc_len = sizeof(struct ar9003_txc);

		pCap->txs_len = sizeof(struct ar9003_txs);

		if (!ah->config.paprd_disable &&

		    ah->eep_ops->get_eeprom(ah, EEP_PAPRD) &&

		    !AR_SREV_9462(ah))

			pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;

	} else {

		pCap->tx_desc_len = sizeof(struct ath_desc);

		if (AR_SREV_9280_20(ah))

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

+1 −2
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ enum ath9k_hw_caps { 
	ATH9K_HW_CAP_LDPC			= BIT(6),

	ATH9K_HW_CAP_FASTCLOCK			= BIT(7),

	ATH9K_HW_CAP_SGI_20			= BIT(8),

	ATH9K_HW_CAP_PAPRD			= BIT(9),

	ATH9K_HW_CAP_ANT_DIV_COMB		= BIT(10),

	ATH9K_HW_CAP_2GHZ			= BIT(11),

	ATH9K_HW_CAP_5GHZ			= BIT(12),
@@ -287,12 +286,12 @@ struct ath9k_ops_config { 
	u8 pcie_clock_req;

	u32 pcie_waen;

	u8 analog_shiftreg;

	u8 paprd_disable;

	u32 ofdm_trig_low;

	u32 ofdm_trig_high;

	u32 cck_trig_high;

	u32 cck_trig_low;

	u32 enable_ani;

	u32 enable_paprd;

	int serialize_regmode;

	bool rx_intr_mitigation;

	bool tx_intr_mitigation;

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

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ set_timer: 
		cal_interval = min(cal_interval, (u32)short_cal_interval);



	mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));

	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {

	if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD) && ah->caldata) {

		if (!ah->caldata->paprd_done)

			ieee80211_queue_work(sc->hw, &sc->paprd_work);

		else if (!ah->paprd_table_write_done)

CRA Git | Maintained and supported by SUSTech CRA and CCSE