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

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

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

parents 3b09c84c 1140afa8

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const int m2ThreshExt_off = 127; 
 * @chan:

 *

 * This is the function to change channel on single-chip devices, that is

 * all devices after ar9280.

 * for AR9300 family of chipsets.

 *

 * This function takes the channel value in MHz and sets

 * hardware channel value. Assumes writes have been enabled to analog bus.

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

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ void ath9k_deinit_device(struct ath_softc *sc); 
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);

void ath9k_reload_chainmask_settings(struct ath_softc *sc);



void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw);

bool ath9k_uses_beacons(int type);



#ifdef CONFIG_ATH9K_PCI

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

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) 
	ah->noise = ath9k_hw_getchan_noise(ah, chan);

	return true;

}

EXPORT_SYMBOL(ath9k_hw_getnf);



void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,

				  struct ath9k_channel *chan)

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include "hw.h"



#define AR_PHY_CCA_FILTERWINDOW_LENGTH_INIT     3

#define AR_PHY_CCA_FILTERWINDOW_LENGTH          5



#define NUM_NF_READINGS       6

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

+2 −6
Original line number Diff line number Diff line
@@ -1629,7 +1629,6 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 


	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {

		struct ieee80211_channel *curchan = hw->conf.channel;

		struct ath9k_channel old_chan;

		int pos = curchan->hw_value;

		int old_pos = -1;

		unsigned long flags;
@@ -1654,11 +1653,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed) 
		 * Preserve the current channel values, before updating

		 * the same channel

		 */

		if (old_pos == pos) {

			memcpy(&old_chan, &sc->sc_ah->channels[pos],

				sizeof(struct ath9k_channel));

			ah->curchan = &old_chan;

		}

		if (ah->curchan && (old_pos == pos))

			ath9k_hw_getnf(ah, ah->curchan);



		ath9k_cmn_update_ichannel(&sc->sc_ah->channels[pos],

					  curchan, conf->channel_type);