Re: pull request: wireless 2013-01-23
From: "John W. Linville" Date: Wed, 23 Jan 2013 15:16:06 -0500 > This is a batch of fixes intende for the 3.8 stream. > > Regarding the iwlwifi bits, Johannes says this: > > "Please pull to get a single fix from Emmanuel for a bug I introduced due > to misunderstanding the code." > > Regarding the mac80211 bits, Johannes says this: > > "I have a few small fixes for you: > * some mesh frames would cause encryption warnings -- fixes from Bob > * scanning would pretty much break an association if we transmitted >anything to the AP while scanning -- fix from Stanislaw > * mode injection was broken by channel contexts -- fix from Felix > * FT roaming was broken: hardware crypto would get disabled by it" > > Along with that, a handful of other fixes confined to specific drivers. > > Avinash Patil fixes a typo in a NULL check in mwifiex. > > Larry Finger fixes a build warning in rtlwifi. Seems safe... > > Stanislaw Gruszka fixes iwlegacy to prevent microcode errors when > switching from IBSS mode to STA mode. > > Felix Fietkau provides a trio of ath9k fixes related to proper tuning. > > Please let me know if there are problems! 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 2013-01-23
From: John W. Linville linvi...@tuxdriver.com Date: Wed, 23 Jan 2013 15:16:06 -0500 This is a batch of fixes intende for the 3.8 stream. Regarding the iwlwifi bits, Johannes says this: Please pull to get a single fix from Emmanuel for a bug I introduced due to misunderstanding the code. Regarding the mac80211 bits, Johannes says this: I have a few small fixes for you: * some mesh frames would cause encryption warnings -- fixes from Bob * scanning would pretty much break an association if we transmitted anything to the AP while scanning -- fix from Stanislaw * mode injection was broken by channel contexts -- fix from Felix * FT roaming was broken: hardware crypto would get disabled by it Along with that, a handful of other fixes confined to specific drivers. Avinash Patil fixes a typo in a NULL check in mwifiex. Larry Finger fixes a build warning in rtlwifi. Seems safe... Stanislaw Gruszka fixes iwlegacy to prevent microcode errors when switching from IBSS mode to STA mode. Felix Fietkau provides a trio of ath9k fixes related to proper tuning. Please let me know if there are problems! 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 2013-01-23
Dave, This is a batch of fixes intende for the 3.8 stream. Regarding the iwlwifi bits, Johannes says this: "Please pull to get a single fix from Emmanuel for a bug I introduced due to misunderstanding the code." Regarding the mac80211 bits, Johannes says this: "I have a few small fixes for you: * some mesh frames would cause encryption warnings -- fixes from Bob * scanning would pretty much break an association if we transmitted anything to the AP while scanning -- fix from Stanislaw * mode injection was broken by channel contexts -- fix from Felix * FT roaming was broken: hardware crypto would get disabled by it" Along with that, a handful of other fixes confined to specific drivers. Avinash Patil fixes a typo in a NULL check in mwifiex. Larry Finger fixes a build warning in rtlwifi. Seems safe... Stanislaw Gruszka fixes iwlegacy to prevent microcode errors when switching from IBSS mode to STA mode. Felix Fietkau provides a trio of ath9k fixes related to proper tuning. Please let me know if there are problems! Thanks, John --- The following changes since commit 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d: r8169: remove the obsolete and incorrect AMD workaround (2013-01-23 13:51:47 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to e91d1694d362f065c51eb07b46b19e8b33c92777: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-01-23 14:34:00 -0500) Avinash Patil (1): mwifiex: fix typo in PCIe adapter NULL check Bob Copeland (2): mac80211: set NEED_TXPROCESSING for PERR frames mac80211: add encrypt headroom to PERR frames Emmanuel Grumbach (1): iwlwifi: audit single frames from AGG queue in RS Felix Fietkau (4): mac80211: fix monitor mode injection ath9k_hw: fix calibration issues on chainmask that don't include chain 0 ath9k_hw: fix chain swap setting when setting rx chainmask to 5 ath9k: allow setting arbitrary antenna masks on AR9003+ Johannes Berg (1): mac80211: fix FT roaming John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Larry Finger (1): rtlwifi: Fix build warning introduced by commit a290593 Stanislaw Gruszka (2): mac80211: synchronize scan off/on-channel and PS states iwlegacy: fix IBSS cleanup drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 ++ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 27 ++--- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/iwlegacy/common.c| 35 +++ drivers/net/wireless/iwlwifi/dvm/tx.c | 2 ++ drivers/net/wireless/mwifiex/pcie.c | 2 +- drivers/net/wireless/rtlwifi/Kconfig | 4 +-- net/mac80211/cfg.c| 12 - net/mac80211/ieee80211_i.h| 6 ++--- net/mac80211/mesh_hwmp.c | 5 +++- net/mac80211/offchannel.c | 19 ++- net/mac80211/scan.c | 15 net/mac80211/tx.c | 9 --- 14 files changed, 67 insertions(+), 75 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c index 8b0d8dc..56317b0 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c @@ -976,6 +976,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, AR_PHY_CL_TAB_1, AR_PHY_CL_TAB_2 }; + ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask); + if (rtt) { if (!ar9003_hw_rtt_restore(ah, chan)) run_rtt_cal = true; diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index ce19c09..3afc24b 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -586,32 +586,19 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, ath9k_hw_synth_delay(ah, chan, synthDelay); } -static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) +void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) { - switch (rx) { - case 0x5: + if (ah->caps.tx_chainmask == 5 || ah->caps.rx_chainmask == 5) REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP, AR_PHY_SWAP_ALT_CHAIN); - case 0x3: - case 0x1:
pull request: wireless 2013-01-23
Dave, This is a batch of fixes intende for the 3.8 stream. Regarding the iwlwifi bits, Johannes says this: Please pull to get a single fix from Emmanuel for a bug I introduced due to misunderstanding the code. Regarding the mac80211 bits, Johannes says this: I have a few small fixes for you: * some mesh frames would cause encryption warnings -- fixes from Bob * scanning would pretty much break an association if we transmitted anything to the AP while scanning -- fix from Stanislaw * mode injection was broken by channel contexts -- fix from Felix * FT roaming was broken: hardware crypto would get disabled by it Along with that, a handful of other fixes confined to specific drivers. Avinash Patil fixes a typo in a NULL check in mwifiex. Larry Finger fixes a build warning in rtlwifi. Seems safe... Stanislaw Gruszka fixes iwlegacy to prevent microcode errors when switching from IBSS mode to STA mode. Felix Fietkau provides a trio of ath9k fixes related to proper tuning. Please let me know if there are problems! Thanks, John --- The following changes since commit 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d: r8169: remove the obsolete and incorrect AMD workaround (2013-01-23 13:51:47 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to e91d1694d362f065c51eb07b46b19e8b33c92777: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-01-23 14:34:00 -0500) Avinash Patil (1): mwifiex: fix typo in PCIe adapter NULL check Bob Copeland (2): mac80211: set NEED_TXPROCESSING for PERR frames mac80211: add encrypt headroom to PERR frames Emmanuel Grumbach (1): iwlwifi: audit single frames from AGG queue in RS Felix Fietkau (4): mac80211: fix monitor mode injection ath9k_hw: fix calibration issues on chainmask that don't include chain 0 ath9k_hw: fix chain swap setting when setting rx chainmask to 5 ath9k: allow setting arbitrary antenna masks on AR9003+ Johannes Berg (1): mac80211: fix FT roaming John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Larry Finger (1): rtlwifi: Fix build warning introduced by commit a290593 Stanislaw Gruszka (2): mac80211: synchronize scan off/on-channel and PS states iwlegacy: fix IBSS cleanup drivers/net/wireless/ath/ath9k/ar9003_calib.c | 2 ++ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 27 ++--- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/iwlegacy/common.c| 35 +++ drivers/net/wireless/iwlwifi/dvm/tx.c | 2 ++ drivers/net/wireless/mwifiex/pcie.c | 2 +- drivers/net/wireless/rtlwifi/Kconfig | 4 +-- net/mac80211/cfg.c| 12 - net/mac80211/ieee80211_i.h| 6 ++--- net/mac80211/mesh_hwmp.c | 5 +++- net/mac80211/offchannel.c | 19 ++- net/mac80211/scan.c | 15 net/mac80211/tx.c | 9 --- 14 files changed, 67 insertions(+), 75 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c index 8b0d8dc..56317b0 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c @@ -976,6 +976,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, AR_PHY_CL_TAB_1, AR_PHY_CL_TAB_2 }; + ar9003_hw_set_chain_masks(ah, ah-caps.rx_chainmask, ah-caps.tx_chainmask); + if (rtt) { if (!ar9003_hw_rtt_restore(ah, chan)) run_rtt_cal = true; diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index ce19c09..3afc24b 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c @@ -586,32 +586,19 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, ath9k_hw_synth_delay(ah, chan, synthDelay); } -static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) +void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) { - switch (rx) { - case 0x5: + if (ah-caps.tx_chainmask == 5 || ah-caps.rx_chainmask == 5) REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP, AR_PHY_SWAP_ALT_CHAIN); - case 0x3: - case 0x1: -