From 0e88f788a799644386adf78c45b1b5734d54a893 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 11 Mar 2012 04:30:08 +0000 Subject: [PATCH] Update to 3.3-rc7 svn path=/dists/trunk/linux-2.6/; revision=18809 --- debian/changelog | 5 +- .../bugfix/all/iwlwifi-fix-key-removal.patch | 57 ------------------- debian/patches/series/base | 1 - 3 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 debian/patches/bugfix/all/iwlwifi-fix-key-removal.patch diff --git a/debian/changelog b/debian/changelog index 155ca1a0b..f4d002743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -linux-2.6 (3.3~rc6-1~experimental.2) UNRELEASED; urgency=low +linux-2.6 (3.3~rc7-1~experimental.1) UNRELEASED; urgency=low + * New upstream release candidate + + [ Ben Hutchings ] * [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64 -- Ben Hutchings Fri, 09 Mar 2012 05:27:29 +0000 diff --git a/debian/patches/bugfix/all/iwlwifi-fix-key-removal.patch b/debian/patches/bugfix/all/iwlwifi-fix-key-removal.patch deleted file mode 100644 index d6afddfb1..000000000 --- a/debian/patches/bugfix/all/iwlwifi-fix-key-removal.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Johannes Berg -Date: Fri, 17 Feb 2012 09:47:14 -0800 -Subject: [PATCH] iwlwifi: fix key removal - -commit 5dcbf480473f6c3f06ad2426b7517038a2a18911 upstream. - -When trying to remove a key, we always send key -flags just setting the key type, not including -the multicast flag and the key ID. As a result, -whenever any key was removed, the unicast key 0 -would be removed, causing a complete connection -loss after the second rekey (the first doesn't -cause a key removal). Fix the key removal code -to include the key ID and multicast flag, thus -removing the correct key. - -Cc: stable@vger.kernel.org -Reported-by: Alexander Schnaidt -Tested-by: Alexander Schnaidt -Signed-off-by: Johannes Berg -Signed-off-by: Wey-Yi Guy -Signed-off-by: John W. Linville ---- - drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c -index 7353826..e483cfa 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c -+++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c -@@ -1187,6 +1187,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, - unsigned long flags; - struct iwl_addsta_cmd sta_cmd; - u8 sta_id = iwlagn_key_sta_id(priv, ctx->vif, sta); -+ __le16 key_flags; - - /* if station isn't there, neither is the key */ - if (sta_id == IWL_INVALID_STATION) -@@ -1212,7 +1213,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, - IWL_ERR(priv, "offset %d not used in uCode key table.\n", - keyconf->hw_key_idx); - -- sta_cmd.key.key_flags = STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID; -+ key_flags = cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); -+ key_flags |= STA_KEY_FLG_MAP_KEY_MSK | STA_KEY_FLG_NO_ENC | -+ STA_KEY_FLG_INVALID; -+ -+ if (!(keyconf->flags & IEEE80211_KEY_FLAG_PAIRWISE)) -+ key_flags |= STA_KEY_MULTICAST_MSK; -+ -+ sta_cmd.key.key_flags = key_flags; - sta_cmd.key.key_offset = WEP_INVALID_OFFSET; - sta_cmd.sta.modify_mask = STA_MODIFY_KEY_MASK; - sta_cmd.mode = STA_CONTROL_MODIFY_MSK; --- -1.7.9.1 - diff --git a/debian/patches/series/base b/debian/patches/series/base index 81537c7eb..ad492781f 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -53,4 +53,3 @@ + features/all/fs-hardlink-creation-restrictions.patch + features/all/fs-hardlink-creation-restrictions-fix.patch + features/all/fs-hardlink-creation-restriction-cleanup.patch -+ bugfix/all/iwlwifi-fix-key-removal.patch