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

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

Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless

parents 8d661637 8ea9ac0a

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,8 @@ static bool ar9002_hw_is_cal_supported(struct ath_hw *ah, 
	case ADC_DC_CAL:

	case ADC_DC_CAL:

		/* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */

		/* Run ADC Gain Cal for non-CCK & non 2GHz-HT20 only */

		if (!IS_CHAN_B(chan) &&

		if (!IS_CHAN_B(chan) &&

		    !(IS_CHAN_2GHZ(chan) && IS_CHAN_HT20(chan)))

		    !((IS_CHAN_2GHZ(chan) || IS_CHAN_A_FAST_CLOCK(ah, chan)) &&

		      IS_CHAN_HT20(chan)))

			supported = true;

			supported = true;

		break;

		break;

	}

	}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -671,7 +671,7 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, 
		REG_WRITE_ARRAY(&ah->iniModesAdditional,

		REG_WRITE_ARRAY(&ah->iniModesAdditional,

				modesIndex, regWrites);

				modesIndex, regWrites);





	if (AR_SREV_9300(ah))

	if (AR_SREV_9330(ah))

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

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





	if (AR_SREV_9340(ah) && !ah->is_clk_25mhz)

	if (AR_SREV_9340(ah) && !ah->is_clk_25mhz)

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -2303,6 +2303,12 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) 
	mutex_lock(&sc->mutex);

	mutex_lock(&sc->mutex);

	cancel_delayed_work_sync(&sc->tx_complete_work);

	cancel_delayed_work_sync(&sc->tx_complete_work);





	if (ah->ah_flags & AH_UNPLUGGED) {

		ath_dbg(common, ATH_DBG_ANY, "Device has been unplugged!\n");

		mutex_unlock(&sc->mutex);

		return;

	}



	if (sc->sc_flags & SC_OP_INVALID) {

	if (sc->sc_flags & SC_OP_INVALID) {

		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");

		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");

		mutex_unlock(&sc->mutex);

		mutex_unlock(&sc->mutex);

drivers/net/wireless/iwlegacy/iwl-3945-rs.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -822,12 +822,15 @@ static void iwl3945_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, 




 out:

 out:





	if (sband->band == IEEE80211_BAND_5GHZ) {

		if (WARN_ON_ONCE(index < IWL_FIRST_OFDM_RATE))

			index = IWL_FIRST_OFDM_RATE;

		rs_sta->last_txrate_idx = index;

		info->control.rates[0].idx = index - IWL_FIRST_OFDM_RATE;

	} else {

		rs_sta->last_txrate_idx = index;

		rs_sta->last_txrate_idx = index;

	if (sband->band == IEEE80211_BAND_5GHZ)

		info->control.rates[0].idx = rs_sta->last_txrate_idx -

				IWL_FIRST_OFDM_RATE;

	else

		info->control.rates[0].idx = rs_sta->last_txrate_idx;

		info->control.rates[0].idx = rs_sta->last_txrate_idx;

	}





	IWL_DEBUG_RATE(priv, "leave: %d\n", index);

	IWL_DEBUG_RATE(priv, "leave: %d\n", index);

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ static int iwlagn_set_temperature_offset_calib(struct iwl_priv *priv) 




	memset(&cmd, 0, sizeof(cmd));

	memset(&cmd, 0, sizeof(cmd));

	iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);

	iwl_set_calib_hdr(&cmd.hdr, IWL_PHY_CALIBRATE_TEMP_OFFSET_CMD);

	memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(offset_calib));

	memcpy(&cmd.radio_sensor_offset, offset_calib, sizeof(*offset_calib));

	if (!(cmd.radio_sensor_offset))

	if (!(cmd.radio_sensor_offset))

		cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;

		cmd.radio_sensor_offset = DEFAULT_RADIO_SENSOR_OFFSET;