]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iwlwifi: mvm: don't WARN when statistics are handled late
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sat, 22 Mar 2014 19:35:43 +0000 (21:35 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 26 Mar 2014 08:42:59 +0000 (09:42 +0100)
commit 1e9291996c4eedf79883f47ec635235e39d3d6cd upstream.

Since the statistics handler is asynchrous, it can very well
be that we will handle the statistics (hence the RSSI
fluctuation) when we already disassociated.
Don't WARN on this case.

This solves: https://bugzilla.redhat.com/show_bug.cgi?id=1071998

Cc: <stable@vger.kernel.org> [3.10+]
Fixes: 2b76ef13086f ("iwlwifi: mvm: implement reduced Tx power")
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/net/wireless/iwlwifi/mvm/bt-coex.c

index 0fad98b85f60dd8dedca668296b27382b15ca0f6..eee2ef6ce24813b9ac3e29cb5c922df3c66e0bd2 100644 (file)
@@ -596,8 +596,11 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
        mutex_lock(&mvm->mutex);
 
-       /* Rssi update while not associated ?! */
-       if (WARN_ON_ONCE(mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT))
+       /*
+        * Rssi update while not associated - can happen since the statistics
+        * are handled asynchronously
+        */
+       if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)
                goto out_unlock;
 
        /* No open connection - reports should be disabled */