rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply some iwlwifi regression fixes not in the 3.2-rc6 wireless snapshot 

Turn-off with_backports for s390x
This commit is contained in:
John W. Linville 2011-12-21 14:32:55 -05:00
parent dd40e894db
commit 02606c8511
3 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
View File

@ -1,3 +1,8 @@
From 78feb35b8161acd95c33a703ed6ab6f554d29387 Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Wed, 14 Dec 2011 08:22:36 -0800
Subject: [PATCH 2/2] iwlwifi: allow to switch to HT40 if not associated
My previous patch
34a5b4b6af104cf18eb50748509528b9bdbc4036 iwlwifi: do not re-configure
HT40 after associated
@ -10,6 +15,7 @@ CC: stable@vger.kernel.org #3.0+
Reported-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Tested-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
@ -30,9 +36,5 @@ index a7a6def..5c7c17c 100644
} else
ctx->ht.is_40mhz = false;
--
1.7.0.4
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

44
iwlwifi-tx_sync-only-on-PAN-context.patch Normal file
View File

@ -0,0 +1,44 @@
From 81670a491849127cd5f86defd2cd03cef1b08d07 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 14 Dec 2011 08:22:35 -0800
Subject: [PATCH 1/2] iwlwifi: tx_sync only on PAN context
Ted reported that he couldn't connect to some APs
and bisected it to the tx_sync implementation.
Disable it for the BSS context to fix this issue.
Reported-by: Ted Ts'o <tytso@mit.edu>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index bacc06c..e0e9a3d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2850,6 +2850,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,
int ret;
u8 sta_id;
+ if (ctx->ctxid != IWL_RXON_CTX_PAN)
+ return 0;
+
IWL_DEBUG_MAC80211(priv, "enter\n");
mutex_lock(&priv->shrd->mutex);
@@ -2898,6 +2901,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,
struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
struct iwl_rxon_context *ctx = vif_priv->ctx;
+ if (ctx->ctxid != IWL_RXON_CTX_PAN)
+ return;
+
IWL_DEBUG_MAC80211(priv, "enter\n");
mutex_lock(&priv->shrd->mutex);
--
1.7.4.4

10
kernel.spec
View File

@ -371,6 +371,7 @@ Summary: The Linux kernel
%define make_target image
%define kernel_image arch/s390/boot/image
%define with_tools 0
%define with_backports 0
%endif
%ifarch sparc64
@ -830,6 +831,7 @@ Patch21049: tpm_tis-delay-after-aborting-cmd.patch
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-change-CONFIG_IWLAGN-CONFIG_IWLWIFI.patch
Patch50100: iwlwifi-tx_sync-only-on-PAN-context.patch
Patch22000: route-cache-garbage-collector.patch
@ -1605,6 +1607,10 @@ ApplyPatch compat-wireless-change-CONFIG_IWLAGN-CONFIG_IWLWIFI.patch
# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
ApplyPatch bcma-brcmsmac-compat.patch
# Apply some iwlwifi regression fixes not in the 3.2-rc6 wireless snapshot
ApplyPatch iwlwifi-tx_sync-only-on-PAN-context.patch
ApplyPatch iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
cd ..
%endif
@ -2277,6 +2283,10 @@ fi
# and build.
%changelog
* Wed Dec 21 2011 John W. Linville <linville@redhat.com>
- Apply some iwlwifi regression fixes not in the 3.2-rc6 wireless snapshot
- Turn-off with_backports for s390x
* Wed Dec 21 2011 Dave Jones <davej@redhat.com> 3.1.5-11
- Reinstate the route cache garbage collector.