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

Commit 8a5809e0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-11-11' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-11-13

Please pull this set of a few more wireless fixes intended for the
3.18 stream...

For the mac80211 bits, Johannes says:

"This has just one fix, for an issue with the CCMP decryption
that can cause a kernel crash. I'm not sure it's remotely
exploitable, but it's an important fix nonetheless."

For the iwlwifi bits, Emmanuel says:

"Two fixes here - we weren't updating mac80211 if a scan
was cut short by RFKILL which confused cfg80211. As a
result, the latter wouldn't allow to run another scan.
Liad fixes a small bug in the firmware dump."

On top of that...

Arend van Spriel corrects a channel width conversion that caused a
WARNING in brcmfmac.

Hauke Mehrtens avoids a NULL pointer dereference in b43.

Larry Finger hits a trio of rtlwifi bugs left over from recent
backporting from the Realtek vendor driver.

Miaoqing Pan fixes a clocking problem in ath9k that could affect
packet timestamps and such.

Stanislaw Gruszka addresses an payload alignment issue that has been
plaguing rt2x00.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 84bc8868 4e6ce4dc

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

+13 −0
Original line number Diff line number Diff line
@@ -664,6 +664,19 @@ static void ar9003_hw_override_ini(struct ath_hw *ah) 
		ah->enabled_cals |= TX_CL_CAL;

	else

		ah->enabled_cals &= ~TX_CL_CAL;



	if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9550(ah)) {

		if (ah->is_clk_25mhz) {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);

			REG_WRITE(ah, AR_SLP32_INC, 0x0001e7ae);

		} else {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);

			REG_WRITE(ah, AR_SLP32_INC, 0x0001e800);

		}

		udelay(100);

	}

}



static void ar9003_hw_prog_ini(struct ath_hw *ah,

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

+0 −13
Original line number Diff line number Diff line
@@ -861,19 +861,6 @@ static void ath9k_hw_init_pll(struct ath_hw *ah, 
	udelay(RTC_PLL_SETTLE_DELAY);



	REG_WRITE(ah, AR_RTC_SLEEP_CLK, AR_RTC_FORCE_DERIVED_CLK);



	if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {

		if (ah->is_clk_25mhz) {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);

			REG_WRITE(ah,  AR_SLP32_INC, 0x0001e7ae);

		} else {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);

			REG_WRITE(ah,  AR_SLP32_INC, 0x0001e800);

		}

		udelay(100);

	}

}



static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,

drivers/net/wireless/b43/phy_common.c

+1 −3
Original line number Diff line number Diff line
@@ -300,9 +300,7 @@ void b43_phy_write(struct b43_wldev *dev, u16 reg, u16 value) 


void b43_phy_copy(struct b43_wldev *dev, u16 destreg, u16 srcreg)

{

	assert_mac_suspended(dev);

	dev->phy.ops->phy_write(dev, destreg,

		dev->phy.ops->phy_read(dev, srcreg));

	b43_phy_write(dev, destreg, b43_phy_read(dev, srcreg));

}



void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask)

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+6 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, 
	primary_offset = ch->center_freq1 - ch->chan->center_freq;

	switch (ch->width) {

	case NL80211_CHAN_WIDTH_20:

	case NL80211_CHAN_WIDTH_20_NOHT:

		ch_inf.bw = BRCMU_CHAN_BW_20;

		WARN_ON(primary_offset != 0);

		break;
@@ -323,6 +324,10 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, 
				ch_inf.sb = BRCMU_CHAN_SB_LU;

		}

		break;

	case NL80211_CHAN_WIDTH_80P80:

	case NL80211_CHAN_WIDTH_160:

	case NL80211_CHAN_WIDTH_5:

	case NL80211_CHAN_WIDTH_10:

	default:

		WARN_ON_ONCE(1);

	}
@@ -333,6 +338,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, 
	case IEEE80211_BAND_5GHZ:

		ch_inf.band = BRCMU_CHAN_BAND_5G;

		break;

	case IEEE80211_BAND_60GHZ:

	default:

		WARN_ON_ONCE(1);

	}

drivers/net/wireless/iwlwifi/mvm/scan.c

+10 −10
Original line number Diff line number Diff line
@@ -602,16 +602,6 @@ static int iwl_mvm_cancel_regular_scan(struct iwl_mvm *mvm) 
					       SCAN_COMPLETE_NOTIFICATION };

	int ret;



	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return 0;



	if (iwl_mvm_is_radio_killed(mvm)) {

		ieee80211_scan_completed(mvm->hw, true);

		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);

		mvm->scan_status = IWL_MVM_SCAN_NONE;

		return 0;

	}



	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,

				   scan_abort_notif,

				   ARRAY_SIZE(scan_abort_notif),
@@ -1400,6 +1390,16 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm, 


int iwl_mvm_cancel_scan(struct iwl_mvm *mvm)

{

	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return 0;



	if (iwl_mvm_is_radio_killed(mvm)) {

		ieee80211_scan_completed(mvm->hw, true);

		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);

		mvm->scan_status = IWL_MVM_SCAN_NONE;

		return 0;

	}



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)

		return iwl_mvm_scan_offload_stop(mvm, true);

	return iwl_mvm_cancel_regular_scan(mvm);