From: Greg Kroah-Hartman Date: Fri, 9 Dec 2011 22:15:54 +0000 (-0800) Subject: remove patches that weren't applied, oops... X-Git-Tag: v3.0.14~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27ec67720b6835d91d9334cf30b34035a0a5b494;p=thirdparty%2Fkernel%2Fstable-queue.git remove patches that weren't applied, oops... --- diff --git a/queue-3.0/series b/queue-3.0/series index da5dd849dcb..663b079a036 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -19,4 +19,3 @@ intel-iommu-set-iommu_superpage-on-vm-domains-to-lowest-common-denominator.patch intel-iommu-fix-superpage-support-in-pfn_to_dma_pte.patch percpu-fix-chunk-range-calculation.patch iwlwifi-do-not-re-configure-ht40-after-associated.patch -xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch diff --git a/queue-3.0/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch b/queue-3.0/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch deleted file mode 100644 index 19d187d1b4d..00000000000 --- a/queue-3.0/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4203223a1aed862b4445fdcd260d6139603a51d9 Mon Sep 17 00:00:00 2001 -From: Tushar Gohad -Date: Thu, 28 Jul 2011 10:36:20 +0000 -Subject: xfrm: Fix key lengths for rfc3686(ctr(aes)) - -From: Tushar Gohad - -commit 4203223a1aed862b4445fdcd260d6139603a51d9 upstream. - -Fix the min and max bit lengths for AES-CTR (RFC3686) keys. -The number of bits in key spec is the key length (128/256) -plus 32 bits of nonce. - -This change takes care of the "Invalid key length" errors -reported by setkey when specifying 288 bit keys for aes-ctr. - -Signed-off-by: Tushar Gohad -Acked-by: Herbert Xu -Signed-off-by: David S. Miller -Signed-off-by: Calvin Owens -Signed-off-by: Greg Kroah-Hartman - ---- a/net/xfrm/xfrm_algo.c -+++ b/net/xfrm/xfrm_algo.c -@@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = { - .desc = { - .sadb_alg_id = SADB_X_EALG_AESCTR, - .sadb_alg_ivlen = 8, -- .sadb_alg_minbits = 128, -- .sadb_alg_maxbits = 256 -+ .sadb_alg_minbits = 160, -+ .sadb_alg_maxbits = 288 - } - }, - }; diff --git a/queue-3.1/iwlwifi-do-not-re-configure-ht40-after-associated.patch b/queue-3.1/iwlwifi-do-not-re-configure-ht40-after-associated.patch deleted file mode 100644 index 174be05dc7c..00000000000 --- a/queue-3.1/iwlwifi-do-not-re-configure-ht40-after-associated.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 34a5b4b6af104cf18eb50748509528b9bdbc4036 Mon Sep 17 00:00:00 2001 -From: Wey-Yi Guy -Date: Fri, 2 Dec 2011 08:19:18 -0800 -Subject: iwlwifi: do not re-configure HT40 after associated - -From: Wey-Yi Guy - -commit 34a5b4b6af104cf18eb50748509528b9bdbc4036 upstream. - -The ht40 setting should not change after association unless channel switch - -This fix a problem we are seeing which cause uCode assert because driver -sending invalid information and make uCode confuse - -Here is the firmware assert message: -kernel: iwlagn 0000:03:00.0: Microcode SW error detected. Restarting 0x82000000. -kernel: iwlagn 0000:03:00.0: Loaded firmware version: 17.168.5.3 build 42301 -kernel: iwlagn 0000:03:00.0: Start IWL Error Log Dump: -kernel: iwlagn 0000:03:00.0: Status: 0x000512E4, count: 6 -kernel: iwlagn 0000:03:00.0: 0x00002078 | ADVANCED_SYSASSERT -kernel: iwlagn 0000:03:00.0: 0x00009514 | uPc -kernel: iwlagn 0000:03:00.0: 0x00009496 | branchlink1 -kernel: iwlagn 0000:03:00.0: 0x00009496 | branchlink2 -kernel: iwlagn 0000:03:00.0: 0x0000D1F2 | interruptlink1 -kernel: iwlagn 0000:03:00.0: 0x00000000 | interruptlink2 -kernel: iwlagn 0000:03:00.0: 0x01008035 | data1 -kernel: iwlagn 0000:03:00.0: 0x0000C90F | data2 -kernel: iwlagn 0000:03:00.0: 0x000005A7 | line -kernel: iwlagn 0000:03:00.0: 0x5080B520 | beacon time -kernel: iwlagn 0000:03:00.0: 0xCC515AE0 | tsf low -kernel: iwlagn 0000:03:00.0: 0x00000003 | tsf hi -kernel: iwlagn 0000:03:00.0: 0x00000000 | time gp1 -kernel: iwlagn 0000:03:00.0: 0x29703BF0 | time gp2 -kernel: iwlagn 0000:03:00.0: 0x00000000 | time gp3 -kernel: iwlagn 0000:03:00.0: 0x000111A8 | uCode version -kernel: iwlagn 0000:03:00.0: 0x000000B0 | hw version -kernel: iwlagn 0000:03:00.0: 0x00480303 | board version -kernel: iwlagn 0000:03:00.0: 0x09E8004E | hcmd -kernel: iwlagn 0000:03:00.0: CSR values: -kernel: iwlagn 0000:03:00.0: (2nd byte of CSR_INT_COALESCING is CSR_INT_PERIODIC_REG) -kernel: iwlagn 0000:03:00.0: CSR_HW_IF_CONFIG_REG: 0X00480303 -kernel: iwlagn 0000:03:00.0: CSR_INT_COALESCING: 0X0000ff40 -kernel: iwlagn 0000:03:00.0: CSR_INT: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_INT_MASK: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_FH_INT_STATUS: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_GPIO_IN: 0X00000030 -kernel: iwlagn 0000:03:00.0: CSR_RESET: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_GP_CNTRL: 0X080403c5 -kernel: iwlagn 0000:03:00.0: CSR_HW_REV: 0X000000b0 -kernel: iwlagn 0000:03:00.0: CSR_EEPROM_REG: 0X07d60ffd -kernel: iwlagn 0000:03:00.0: CSR_EEPROM_GP: 0X90000001 -kernel: iwlagn 0000:03:00.0: CSR_OTP_GP_REG: 0X00030001 -kernel: iwlagn 0000:03:00.0: CSR_GIO_REG: 0X00080044 -kernel: iwlagn 0000:03:00.0: CSR_GP_UCODE_REG: 0X000093bb -kernel: iwlagn 0000:03:00.0: CSR_GP_DRIVER_REG: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_UCODE_DRV_GP1: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_UCODE_DRV_GP2: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_LED_REG: 0X00000078 -kernel: iwlagn 0000:03:00.0: CSR_DRAM_INT_TBL_REG: 0X88214dd2 -kernel: iwlagn 0000:03:00.0: CSR_GIO_CHICKEN_BITS: 0X27800200 -kernel: iwlagn 0000:03:00.0: CSR_ANA_PLL_CFG: 0X00000000 -kernel: iwlagn 0000:03:00.0: CSR_HW_REV_WA_REG: 0X0001001a -kernel: iwlagn 0000:03:00.0: CSR_DBG_HPET_MEM_REG: 0Xffff0010 -kernel: iwlagn 0000:03:00.0: FH register values: -kernel: iwlagn 0000:03:00.0: FH_RSCSR_CHNL0_STTS_WPTR_REG: 0X21316d00 -kernel: iwlagn 0000:03:00.0: FH_RSCSR_CHNL0_RBDCB_BASE_REG: 0X021479c0 -kernel: iwlagn 0000:03:00.0: FH_RSCSR_CHNL0_WPTR: 0X00000060 -kernel: iwlagn 0000:03:00.0: FH_MEM_RCSR_CHNL0_CONFIG_REG: 0X80819104 -kernel: iwlagn 0000:03:00.0: FH_MEM_RSSR_SHARED_CTRL_REG: 0X000000fc -kernel: iwlagn 0000:03:00.0: FH_MEM_RSSR_RX_STATUS_REG: 0X07030000 -kernel: iwlagn 0000:03:00.0: FH_MEM_RSSR_RX_ENABLE_ERR_IRQ2DRV: 0X00000000 -kernel: iwlagn 0000:03:00.0: FH_TSSR_TX_STATUS_REG: 0X07ff0001 -kernel: iwlagn 0000:03:00.0: FH_TSSR_TX_ERROR_REG: 0X00000000 -kernel: iwlagn 0000:03:00.0: Start IWL Event Log Dump: display last 20 entries -kernel: ------------[ cut here ]------------ -WARNING: at net/mac80211/util.c:1208 ieee80211_reconfig+0x1f1/0x407() -kernel: Hardware name: 4290W4H -kernel: Pid: 1896, comm: kworker/0:0 Not tainted 3.1.0 #2 -kernel: Call Trace: -kernel: [] ? warn_slowpath_common+0x73/0x87 -kernel: [] ? ieee80211_reconfig+0x1f1/0x407 -kernel: [] ? ieee80211_recalc_smps_work+0x32/0x32 -kernel: [] ? ieee80211_restart_work+0x7e/0x87 -kernel: [] ? process_one_work+0x1c8/0x2e3 -kernel: [] ? worker_thread+0x17a/0x23a -kernel: [] ? manage_workers.clone.18+0x15b/0x15b -kernel: [] ? manage_workers.clone.18+0x15b/0x15b -kernel: [] ? kthread+0x7a/0x82 -kernel: [] ? kernel_thread_helper+0x4/0x10 -kernel: [] ? kthread_flush_work_fn+0x11/0x11 -kernel: [] ? gs_change+0xb/0xb - -Reported-by: Udo Steinberg -Signed-off-by: Wey-Yi Guy -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c -+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c -@@ -528,6 +528,24 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) - return 0; - } - -+void iwlagn_config_ht40(struct ieee80211_conf *conf, -+ struct iwl_rxon_context *ctx) -+{ -+ if (conf_is_ht40_minus(conf)) { -+ ctx->ht.extension_chan_offset = -+ IEEE80211_HT_PARAM_CHA_SEC_BELOW; -+ ctx->ht.is_40mhz = true; -+ } else if (conf_is_ht40_plus(conf)) { -+ ctx->ht.extension_chan_offset = -+ IEEE80211_HT_PARAM_CHA_SEC_ABOVE; -+ ctx->ht.is_40mhz = true; -+ } else { -+ ctx->ht.extension_chan_offset = -+ IEEE80211_HT_PARAM_CHA_SEC_NONE; -+ ctx->ht.is_40mhz = false; -+ } -+} -+ - int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) - { - struct iwl_priv *priv = hw->priv; -@@ -586,19 +604,11 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) - ctx->ht.enabled = conf_is_ht(conf); - - if (ctx->ht.enabled) { -- if (conf_is_ht40_minus(conf)) { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_BELOW; -- ctx->ht.is_40mhz = true; -- } else if (conf_is_ht40_plus(conf)) { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_ABOVE; -- ctx->ht.is_40mhz = true; -- } else { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_NONE; -- ctx->ht.is_40mhz = false; -- } -+ /* if HT40 is used, it should not change -+ * after associated except channel switch */ -+ if (iwl_is_associated_ctx(ctx) && -+ !ctx->ht.is_40mhz) -+ iwlagn_config_ht40(conf, ctx); - } else - ctx->ht.is_40mhz = false; - -diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c -index 6094dea..f556451 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-agn.c -+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -2610,21 +2610,9 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw, - - /* Configure HT40 channels */ - ctx->ht.enabled = conf_is_ht(conf); -- if (ctx->ht.enabled) { -- if (conf_is_ht40_minus(conf)) { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_BELOW; -- ctx->ht.is_40mhz = true; -- } else if (conf_is_ht40_plus(conf)) { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_ABOVE; -- ctx->ht.is_40mhz = true; -- } else { -- ctx->ht.extension_chan_offset = -- IEEE80211_HT_PARAM_CHA_SEC_NONE; -- ctx->ht.is_40mhz = false; -- } -- } else -+ if (ctx->ht.enabled) -+ iwlagn_config_ht40(conf, ctx); -+ else - ctx->ht.is_40mhz = false; - - if ((le16_to_cpu(ctx->staging.channel) != ch)) -diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h -index 5b936ec..3856aba 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-agn.h -+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h -@@ -86,6 +86,8 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - struct ieee80211_bss_conf *bss_conf, - u32 changes); -+void iwlagn_config_ht40(struct ieee80211_conf *conf, -+ struct iwl_rxon_context *ctx); - - /* uCode */ - int iwlagn_rx_calib_result(struct iwl_priv *priv, diff --git a/queue-3.1/series b/queue-3.1/series index 3115e712fa3..eb799bae163 100644 --- a/queue-3.1/series +++ b/queue-3.1/series @@ -25,5 +25,3 @@ target-fix-page-length-in-emulated-inquiry-vpd-page-86h.patch iscsi-target-add-missing-f_bit-for-iscsi_tm_rsp.patch target-file-walk-properly-over-sg-list.patch percpu-fix-chunk-range-calculation.patch -xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch -iwlwifi-do-not-re-configure-ht40-after-associated.patch diff --git a/queue-3.1/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch b/queue-3.1/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch deleted file mode 100644 index 19d187d1b4d..00000000000 --- a/queue-3.1/xfrm-fix-key-lengths-for-rfc3686-ctr-aes.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4203223a1aed862b4445fdcd260d6139603a51d9 Mon Sep 17 00:00:00 2001 -From: Tushar Gohad -Date: Thu, 28 Jul 2011 10:36:20 +0000 -Subject: xfrm: Fix key lengths for rfc3686(ctr(aes)) - -From: Tushar Gohad - -commit 4203223a1aed862b4445fdcd260d6139603a51d9 upstream. - -Fix the min and max bit lengths for AES-CTR (RFC3686) keys. -The number of bits in key spec is the key length (128/256) -plus 32 bits of nonce. - -This change takes care of the "Invalid key length" errors -reported by setkey when specifying 288 bit keys for aes-ctr. - -Signed-off-by: Tushar Gohad -Acked-by: Herbert Xu -Signed-off-by: David S. Miller -Signed-off-by: Calvin Owens -Signed-off-by: Greg Kroah-Hartman - ---- a/net/xfrm/xfrm_algo.c -+++ b/net/xfrm/xfrm_algo.c -@@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = { - .desc = { - .sadb_alg_id = SADB_X_EALG_AESCTR, - .sadb_alg_ivlen = 8, -- .sadb_alg_minbits = 128, -- .sadb_alg_maxbits = 256 -+ .sadb_alg_minbits = 160, -+ .sadb_alg_maxbits = 288 - } - }, - };