delete queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch

diff --git a/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch b/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
deleted file mode 100644 (file)
index fd465be..0000000
--- a/queue-3.10/iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a53ee0a308b16e392e0219c585b10f329345766b Mon Sep 17 00:00:00 2001
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Date: Thu, 25 Jul 2013 13:14:34 +0300
-Subject: iwlwifi: pcie: clear RFKILL interrupt in AMPG
-
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-
-commit a53ee0a308b16e392e0219c585b10f329345766b upstream.
-
-If we forget to do so, we can't send HCMD to firmware while
-the NIC is in RFKILL state.
-
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/iwlwifi/iwl-prph.h |    2 ++
- drivers/net/wireless/iwlwifi/pcie/rx.c  |    8 ++++++++
- 2 files changed, 10 insertions(+)
-
---- a/drivers/net/wireless/iwlwifi/iwl-prph.h
-+++ b/drivers/net/wireless/iwlwifi/iwl-prph.h
-@@ -97,6 +97,8 @@
- 
- #define APMG_PCIDEV_STT_VAL_L1_ACT_DIS                (0x00000800)
- 
-+#define APMG_RTC_INT_STT_RFKILL               (0x10000000)
-+
- /* Device system time */
- #define DEVICE_SYSTEM_TIME_REG 0xA0206C
- 
---- a/drivers/net/wireless/iwlwifi/pcie/rx.c
-+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
-@@ -886,6 +886,14 @@ irqreturn_t iwl_pcie_irq_handler(int irq
- 
-               iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill);
-               if (hw_rfkill) {
-+                      /*
-+                       * Clear the interrupt in APMG if the NIC is going down.
-+                       * Note that when the NIC exits RFkill (else branch), we
-+                       * can't access prph and the NIC will be reset in
-+                       * start_hw anyway.
-+                       */
-+                      iwl_write_prph(trans, APMG_RTC_INT_STT_REG,
-+                                     APMG_RTC_INT_STT_RFKILL);
-                       set_bit(STATUS_RFKILL, &trans_pcie->status);
-                       if (test_and_clear_bit(STATUS_HCMD_ACTIVE,
-                                              &trans_pcie->status))

diff --git a/queue-3.10/series b/queue-3.10/series
index 2371126dba474975a7ea4a63cc9ef4ee86c3a474..d76968a79c95cba67d6417382c55f986b5817fc6 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -32,7 +32,6 @@ iwlwifi-mvm-fix-bug-in-scan-ssid.patch
 iwlwifi-mvm-refuse-connection-to-aps-with-bi-16.patch
 iwlwifi-add-dell-sku-for-5150-hmc.patch
 iwlwifi-mvm-fix-flushing-not-started-aggregation-sessions.patch
-iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch
 ath9k_htc-do-some-initial-hardware-configuration.patch
 ath9k_htc-reboot-firmware-if-it-was-loaded.patch
 nl80211-fix-mgmt-tx-status-and-testmode-reporting-for-netns.patch