Re: pull request: wireless 2014-11-13
From: "John W. Linville" Date: Thu, 13 Nov 2014 16:28:16 -0500 > Please pull this set of a few more wireless fixes intended for the > 3.18 stream... Pulled, thanks John. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: pull request: wireless 2014-11-13
From: John W. Linville linvi...@tuxdriver.com Date: Thu, 13 Nov 2014 16:28:16 -0500 Please pull this set of a few more wireless fixes intended for the 3.18 stream... Pulled, thanks John. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
pull request: wireless 2014-11-13
Dave,
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!
John
---
The following changes since commit 0c9a67c8f1d2b71a89f66349362412e9bf6becab:
Merge tag 'mac80211-for-john-2014-11-04' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2014-11-04
15:56:33 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
tags/master-2014-11-11
for you to fetch changes up to 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9:
ath9k: Fix RTC_DERIVED_CLK usage (2014-11-11 16:24:18 -0500)
Arend van Spriel (1):
brcmfmac: fix conversion of channel width 20MHZ_NOHT
Emmanuel Grumbach (1):
iwlwifi: mvm: abort scan upon RFKILL
Hauke Mehrtens (1):
b43: fix NULL pointer dereference in b43_phy_copy()
John W. Linville (2):
Merge tag 'mac80211-for-john-2014-11-10' of
git://git.kernel.org/.../jberg/mac80211
Merge tag 'iwlwifi-for-john-2014-11-10' of
git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Larry Finger (3):
rtlwifi: Fix setting of tx descriptor for new trx flow
rtlwifi: Fix errors in descriptor manipulation
rtlwifi: rtl8192se: Fix connection problems
Liad Kaufman (1):
iwlwifi: pcie: fix prph dump length
Miaoqing Pan (1):
ath9k: Fix RTC_DERIVED_CLK usage
Ronald Wahl (1):
mac80211: Fix regression that triggers a kernel BUG with CCMP
Stanislaw Gruszka (1):
rt2x00: do not align payload on modern H/W
drivers/net/wireless/ath/ath9k/ar9003_phy.c| 13 ++
drivers/net/wireless/ath/ath9k/hw.c| 13 --
drivers/net/wireless/b43/phy_common.c | 4 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +++
drivers/net/wireless/iwlwifi/mvm/scan.c| 20 -
drivers/net/wireless/iwlwifi/pcie/trans.c | 3 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 50 ++
drivers/net/wireless/rtlwifi/pci.c | 19 +---
drivers/net/wireless/rtlwifi/rtl8192se/hw.c| 7 ++-
drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 2 +
drivers/net/wireless/rtlwifi/rtl8192se/sw.c| 16 +++
net/mac80211/aes_ccm.c | 3 ++
12 files changed, 81 insertions(+), 75 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 697c4ae90af0..1e8ea5e4d4ca 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -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,
diff --git a/drivers/net/wireless/ath/ath9k/hw.c
b/drivers/net/wireless/ath/ath9k/hw.c
index 8be4b1453394..2ad605760e21 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -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);
-
pull request: wireless 2014-11-13
Dave,
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!
John
---
The following changes since commit 0c9a67c8f1d2b71a89f66349362412e9bf6becab:
Merge tag 'mac80211-for-john-2014-11-04' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2014-11-04
15:56:33 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
tags/master-2014-11-11
for you to fetch changes up to 4e6ce4dc7ce71d0886908d55129d5d6482a27ff9:
ath9k: Fix RTC_DERIVED_CLK usage (2014-11-11 16:24:18 -0500)
Arend van Spriel (1):
brcmfmac: fix conversion of channel width 20MHZ_NOHT
Emmanuel Grumbach (1):
iwlwifi: mvm: abort scan upon RFKILL
Hauke Mehrtens (1):
b43: fix NULL pointer dereference in b43_phy_copy()
John W. Linville (2):
Merge tag 'mac80211-for-john-2014-11-10' of
git://git.kernel.org/.../jberg/mac80211
Merge tag 'iwlwifi-for-john-2014-11-10' of
git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Larry Finger (3):
rtlwifi: Fix setting of tx descriptor for new trx flow
rtlwifi: Fix errors in descriptor manipulation
rtlwifi: rtl8192se: Fix connection problems
Liad Kaufman (1):
iwlwifi: pcie: fix prph dump length
Miaoqing Pan (1):
ath9k: Fix RTC_DERIVED_CLK usage
Ronald Wahl (1):
mac80211: Fix regression that triggers a kernel BUG with CCMP
Stanislaw Gruszka (1):
rt2x00: do not align payload on modern H/W
drivers/net/wireless/ath/ath9k/ar9003_phy.c| 13 ++
drivers/net/wireless/ath/ath9k/hw.c| 13 --
drivers/net/wireless/b43/phy_common.c | 4 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +++
drivers/net/wireless/iwlwifi/mvm/scan.c| 20 -
drivers/net/wireless/iwlwifi/pcie/trans.c | 3 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 50 ++
drivers/net/wireless/rtlwifi/pci.c | 19 +---
drivers/net/wireless/rtlwifi/rtl8192se/hw.c| 7 ++-
drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 2 +
drivers/net/wireless/rtlwifi/rtl8192se/sw.c| 16 +++
net/mac80211/aes_ccm.c | 3 ++
12 files changed, 81 insertions(+), 75 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 697c4ae90af0..1e8ea5e4d4ca 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -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,
diff --git a/drivers/net/wireless/ath/ath9k/hw.c
b/drivers/net/wireless/ath/ath9k/hw.c
index 8be4b1453394..2ad605760e21 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -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);
-
