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

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

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/wl12xx/main.c
parents 56fd49e3 08740735

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3426,7 +3426,7 @@ M: Wey-Yi Guy <wey-yi.w.guy@intel.com> 
M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

S:	Supported

F:	drivers/net/wireless/iwlwifi/
@@ -4528,7 +4528,7 @@ L: linux-wireless@vger.kernel.org 
S:	Maintained

F:	net/nfc/

F:	include/linux/nfc.h

F:	include/net/nfc.h

F:	include/net/nfc/

F:	drivers/nfc/



NFS, SUNRPC, AND LOCKD CLIENTS

drivers/bcma/driver_chipcommon_pmu.c

+29 −9
Original line number Diff line number Diff line
@@ -18,20 +18,40 @@ static u32 bcma_chipco_pll_read(struct bcma_drv_cc *cc, u32 offset) 
	return bcma_cc_read32(cc, BCMA_CC_PLLCTL_DATA);

}



static void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,

					u32 offset, u32 mask, u32 set)

void bcma_chipco_pll_write(struct bcma_drv_cc *cc, u32 offset, u32 value)

{

	u32 value;

	bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);

	bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);

	bcma_cc_write32(cc, BCMA_CC_PLLCTL_DATA, value);

}

EXPORT_SYMBOL_GPL(bcma_chipco_pll_write);



	bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);

void bcma_chipco_pll_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,

			     u32 set)

{

	bcma_cc_write32(cc, BCMA_CC_PLLCTL_ADDR, offset);

	bcma_cc_read32(cc, BCMA_CC_PLLCTL_ADDR);

	bcma_cc_maskset32(cc, BCMA_CC_PLLCTL_DATA, mask, set);

}

EXPORT_SYMBOL_GPL(bcma_chipco_pll_maskset);



void bcma_chipco_chipctl_maskset(struct bcma_drv_cc *cc,

				 u32 offset, u32 mask, u32 set)

{

	bcma_cc_write32(cc, BCMA_CC_CHIPCTL_ADDR, offset);

	bcma_cc_read32(cc, BCMA_CC_CHIPCTL_ADDR);

	value = bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);

	value &= mask;

	value |= set;

	bcma_cc_write32(cc, BCMA_CC_CHIPCTL_DATA, value);

	bcma_cc_read32(cc, BCMA_CC_CHIPCTL_DATA);

	bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL_DATA, mask, set);

}

EXPORT_SYMBOL_GPL(bcma_chipco_chipctl_maskset);



void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask,

				u32 set)

{

	bcma_cc_write32(cc, BCMA_CC_REGCTL_ADDR, offset);

	bcma_cc_read32(cc, BCMA_CC_REGCTL_ADDR);

	bcma_cc_maskset32(cc, BCMA_CC_REGCTL_DATA, mask, set);

}

EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);



static void bcma_pmu_pll_init(struct bcma_drv_cc *cc)

{

drivers/net/wireless/adm8211.c

+2 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,8 @@ static int adm8211_hw_reset(struct ieee80211_hw *dev) 
	return 0;

}



static u64 adm8211_get_tsft(struct ieee80211_hw *dev)

static u64 adm8211_get_tsft(struct ieee80211_hw *dev,

			    struct ieee80211_vif *vif)

{

	struct adm8211_priv *priv = dev->priv;

	u32 tsftl;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue, 




static u64

ath5k_get_tsf(struct ieee80211_hw *hw)

ath5k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath5k_hw *ah = hw->priv;
@@ -611,7 +611,7 @@ ath5k_get_tsf(struct ieee80211_hw *hw) 




static void

ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf)

ath5k_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u64 tsf)

{

	struct ath5k_hw *ah = hw->priv;
@@ -620,7 +620,7 @@ ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf) 




static void

ath5k_reset_tsf(struct ieee80211_hw *hw)

ath5k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct ath5k_hw *ah = hw->priv;

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

+8 −2
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel) 
		immunityLevel, aniState->noiseFloor,

		aniState->rssiThrLow, aniState->rssiThrHigh);



	if (aniState->update_ani)

		aniState->ofdmNoiseImmunityLevel = immunityLevel;



	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
@@ -346,6 +347,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel) 
	    immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)

		immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;



	if (aniState->update_ani)

		aniState->cckNoiseImmunityLevel = immunityLevel;



	entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
@@ -593,6 +595,7 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
				aniState->ofdmNoiseImmunityLevel,

				aniState->cckNoiseImmunityLevel);



			aniState->update_ani = false;

			ath9k_hw_set_ofdm_nil(ah, ATH9K_ANI_OFDM_DEF_LEVEL);

			ath9k_hw_set_cck_nil(ah, ATH9K_ANI_CCK_DEF_LEVEL);

		}
@@ -609,6 +612,7 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning) 
			aniState->ofdmNoiseImmunityLevel,

			aniState->cckNoiseImmunityLevel);



			aniState->update_ani = true;

			ath9k_hw_set_ofdm_nil(ah,

					      aniState->ofdmNoiseImmunityLevel);

			ath9k_hw_set_cck_nil(ah,
@@ -892,6 +896,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah) 
		ani->ofdmWeakSigDetectOff =

			!ATH9K_ANI_USE_OFDM_WEAK_SIG;

		ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;

		ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;

		ani->update_ani = false;

	}



	/*