diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-03-13 11:11:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-26 15:07:22 -0400 |
commit | 883a649b737cdbe3ede7e50f3f939fd706ed5c4e (patch) | |
tree | 6091c7138144cd252c830c7dd357438c98c4e31c /drivers/net/wireless/iwlegacy/4965-mac.c | |
parent | 8a78335442cea429afb2b964318b6e257448ea00 (diff) |
iwlegacy: do not nulify il->vif on reset
This il->vif is dereferenced in different part of iwlegacy code, so do
not nullify it. This should fix random crashes observed in companion
with microcode errors i.e. crash in il3945_config_ap().
Additionally this should address also
WARNING: at drivers/net/wireless/iwlegacy/common.c:4656 il_mac_remove_interface
at least one of the possible reasons of that warning.
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 7b54dbb338be..b88bb2734197 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -5651,8 +5651,6 @@ il4965_bg_restart(struct work_struct *data) | |||
5651 | 5651 | ||
5652 | if (test_and_clear_bit(S_FW_ERROR, &il->status)) { | 5652 | if (test_and_clear_bit(S_FW_ERROR, &il->status)) { |
5653 | mutex_lock(&il->mutex); | 5653 | mutex_lock(&il->mutex); |
5654 | /* FIXME: do we dereference vif without mutex locked ? */ | ||
5655 | il->vif = NULL; | ||
5656 | il->is_open = 0; | 5654 | il->is_open = 0; |
5657 | 5655 | ||
5658 | __il4965_down(il); | 5656 | __il4965_down(il); |