]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iwlwifi: mvm: always use mac color zero
authorLuciano Coelho <luciano.coelho@intel.com>
Thu, 29 Jan 2015 10:48:20 +0000 (12:48 +0200)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 2 Mar 2015 13:17:00 +0000 (13:17 +0000)
commit 5523d11cc46393a1e61b7ef4a0b2d4e7ed9521e4 upstream.

We don't really need to use different mac colors when adding mac
contexts, because they're not used anywhere.  In fact, the firmware
doesn't accept 255 as a valid color, so we get into a SYSASSERT 0x3401
when we reach that.

Remove the color increment to use always zero and avoid reaching 255.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c

index ec70feccf77cd434e855fb22a3c568f406fd4cf9..1a53515530782d66c6d194c2df5c5e93ebc3e872 100644 (file)
@@ -627,9 +627,6 @@ static void iwl_mvm_cleanup_iterator(void *data, u8 *mac,
        mvmvif->uploaded = false;
        mvmvif->ap_sta_id = IWL_MVM_STATION_COUNT;
 
-       /* does this make sense at all? */
-       mvmvif->color++;
-
        spin_lock_bh(&mvm->time_event_lock);
        iwl_mvm_te_clear_data(mvm, &mvmvif->time_event_data);
        spin_unlock_bh(&mvm->time_event_lock);