iwlwifi: mvm: fix error checking for multi/broadcast sta
authorJohannes Berg <johannes.berg@intel.com>
Thu, 22 Feb 2018 12:51:21 +0000 (13:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 05:52:15 +0000 (07:52 +0200)
[ Upstream commit 75fd4fec3e4c43b131c7c4958adb3ab9f1665513 ]

The earlier patch called the station add functions but didn't
assign their return value to the ret variable, so that the
checks for it were meaningless. Fix that.

Found by smatch:

.../mac80211.c:2560 iwl_mvm_start_ap_ibss() warn: we tested 'ret' before and it was 'false'
.../mac80211.c:2563 iwl_mvm_start_ap_ibss() warn: we tested 'ret' before and it was 'false'

Fixes: 3a89411cd31c ("iwlwifi: mvm: fix assert 0x2B00 on older FWs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

index 6602b706a121e7457bc0cb6c4206e30912d0cae3..459e1d6a7ffa3f3114dc79bc0687beabea12b8e6 100644 (file)
@@ -2153,10 +2153,10 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,
                 * Send the bcast station. At this stage the TBTT and DTIM time
                 * events are added and applied to the scheduler
                 */
-               iwl_mvm_send_add_bcast_sta(mvm, vif);
+               ret = iwl_mvm_send_add_bcast_sta(mvm, vif);
                if (ret)
                        goto out_unbind;
-               iwl_mvm_add_mcast_sta(mvm, vif);
+               ret = iwl_mvm_add_mcast_sta(mvm, vif);
                if (ret) {
                        iwl_mvm_send_rm_bcast_sta(mvm, vif);
                        goto out_unbind;