On Tue, 2012-03-13 at 16:10 +0100, Stanislaw Gruszka wrote:
> 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.
I'm not completely convinced -- there are parts of the driver that are
active even when no interface has ever been added.
Have you seen crashes due to this? I have seen the warning in the past
but in some recent firmware reset testing I never ran into it again...
johannes
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
> ---
> drivers/net/wireless/iwlwifi/iwl-agn.c | 3 ---
> drivers/net/wireless/iwlwifi/iwl-mac80211.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 28422c0..6375e5a 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -862,7 +862,6 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work)
>
> void iwlagn_prepare_restart(struct iwl_priv *priv)
> {
> - struct iwl_rxon_context *ctx;
> bool bt_full_concurrent;
> u8 bt_ci_compliance;
> u8 bt_load;
> @@ -871,8 +870,6 @@ void iwlagn_prepare_restart(struct iwl_priv *priv)
>
> lockdep_assert_held(&priv->mutex);
>
> - for_each_context(priv, ctx)
> - ctx->vif = NULL;
> priv->is_open = 0;
>
> /*
> diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
> index 9212ee3..4e8786d 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
> @@ -1241,6 +1241,7 @@ static 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);
> @@ -1262,6 +1263,13 @@ static 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)) {
> @@ -1288,7 +1296,7 @@ static 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
