diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-10 15:32:32 +0100 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-02-27 09:04:13 -0500 |
commit | c4eefd753012467261cf221babd2e8639b81d3ca (patch) | |
tree | 0f6e09a6b51f410455330f046a8e03787d5a126e /recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch | |
parent | 14f31c3c5a19dde049355ced3edd121c31842460 (diff) | |
download | meta-ti-c4eefd753012467261cf221babd2e8639b81d3ca.tar.gz |
linux-ti33x-psp 3.2: update to 3.2.5
Runtime tested on a beaglebone A3
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch new file mode 100644 index 00000000..8290ecde --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.2/0126-iwlagn-check-for-SMPS-mode.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From a19ea3b8cc51cbeb52d0b2e1aa7d8987f123e3ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Wey-Yi Guy <wey-yi.w.guy@intel.com> | ||
3 | Date: Thu, 10 Nov 2011 06:55:04 -0800 | ||
4 | Subject: [PATCH 126/130] iwlagn: check for SMPS mode | ||
5 | |||
6 | commit b2ccccdca46273c7b321ecf5041c362cd950da20 upstream. | ||
7 | |||
8 | Check and report WARN only when its invalid | ||
9 | |||
10 | Resolves: | ||
11 | https://bugzilla.kernel.org/show_bug.cgi?id=42621 | ||
12 | https://bugzilla.redhat.com/show_bug.cgi?id=766071 | ||
13 | |||
14 | Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> | ||
15 | Signed-off-by: John W. Linville <linville@tuxdriver.com> | ||
16 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | ||
17 | --- | ||
18 | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 + | ||
19 | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 3 +++ | ||
20 | 2 files changed, 4 insertions(+), 0 deletions(-) | ||
21 | |||
22 | diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | ||
23 | index 1a52ed2..6465983 100644 | ||
24 | --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | ||
25 | +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | ||
26 | @@ -827,6 +827,7 @@ static int iwl_get_idle_rx_chain_count(struct iwl_priv *priv, int active_cnt) | ||
27 | case IEEE80211_SMPS_STATIC: | ||
28 | case IEEE80211_SMPS_DYNAMIC: | ||
29 | return IWL_NUM_IDLE_CHAINS_SINGLE; | ||
30 | + case IEEE80211_SMPS_AUTOMATIC: | ||
31 | case IEEE80211_SMPS_OFF: | ||
32 | return active_cnt; | ||
33 | default: | ||
34 | diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | ||
35 | index 5c7c17c..d552fa3 100644 | ||
36 | --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | ||
37 | +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | ||
38 | @@ -559,6 +559,9 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) | ||
39 | |||
40 | mutex_lock(&priv->shrd->mutex); | ||
41 | |||
42 | + if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status)) | ||
43 | + goto out; | ||
44 | + | ||
45 | if (unlikely(test_bit(STATUS_SCANNING, &priv->shrd->status))) { | ||
46 | IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); | ||
47 | goto out; | ||
48 | -- | ||
49 | 1.7.7.4 | ||
50 | |||