1 files changed, 85 insertions, 0 deletions

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0145-iwlwifi-do-not-nulify-ctx-vif-on-reset.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0145-iwlwifi-do-not-nulify-ctx-vif-on-reset.patch
new file mode 100644
index 00000000..cdd9c4a0
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0145-iwlwifi-do-not-nulify-ctx-vif-on-reset.patch
@@ -0,0 +1,85 @@
+From 3fabef3cff16e308410b75ac612ba271be969051 Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Wed, 18 Apr 2012 08:01:15 -0700
+Subject: [PATCH 145/165] iwlwifi: do not nulify ctx->vif on reset
+
+commit 8db4c7e25d153fb049e81715d72fa3be3a0c3b69 upstream.
+
+ctx->vif is dereferenced in different part of iwlwifi code, so do not
+nullify it.
+
+This should address at least one of the possible reasons of WARNING at
+iwlagn_mac_remove_interface, and perhaps some random crashes when
+firmware reset is performed.
+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+[bwh: Backported to 3.2:
+ - Change filename iwl-mac80211.c to iwl-core.c
+ - Change context in iwlagn_prepare_restart()]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/net/wireless/iwlwifi/iwl-agn.c  |    3 ---
+ drivers/net/wireless/iwlwifi/iwl-core.c |   10 +++++++++-
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
+index e0e9a3d..d7d2512 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
+@@ -1504,7 +1504,6 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
+ 
+ static void iwlagn_prepare_restart(struct iwl_priv *priv)
+ {
+-       struct iwl_rxon_context *ctx;
+        bool bt_full_concurrent;
+        u8 bt_ci_compliance;
+        u8 bt_load;
+@@ -1513,8 +1512,6 @@ static void iwlagn_prepare_restart(struct iwl_priv *priv)
+ 
+        lockdep_assert_held(&priv->shrd->mutex);
+ 
+-       for_each_context(priv, ctx)
+-               ctx->vif = NULL;
+        priv->is_open = 0;
+ 
+        /*
+diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
+index 3d75d4c..832ec4d 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-core.c
++++ b/drivers/net/wireless/iwlwifi/iwl-core.c
+@@ -1228,6 +1228,7 @@ int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
+        struct iwl_rxon_context *tmp, *ctx = NULL;
+        int err;
+        enum nl80211_iftype viftype = ieee80211_vif_type_p2p(vif);
++       bool reset = false;
+ 
+        IWL_DEBUG_MAC80211(priv, "enter: type %d, addr %pM\n",
+                           viftype, vif->addr);
+@@ -1249,6 +1250,13 @@ int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
+                        tmp->interface_modes | tmp->exclusive_interface_modes;
+ 
+                if (tmp->vif) {
++                       /* On reset we need to add the same interface again */
++                       if (tmp->vif == vif) {
++                               reset = true;
++                               ctx = tmp;
++                               break;
++                       }
++
+                        /* check if this busy context is exclusive */
+                        if (tmp->exclusive_interface_modes &
+                                                BIT(tmp->vif->type)) {
+@@ -1275,7 +1283,7 @@ int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
+        ctx->vif = vif;
+ 
+        err = iwl_setup_interface(priv, ctx);
+-       if (!err)
++       if (!err || reset)
+                goto out;
+ 
+        ctx->vif = NULL;
+-- 
+1.7.7.6
+