wifi: cfg80211: fix assoc response warning on failed links

The warning here shouldn't be done before we even set the bss field (or should've used the input data). Move the assignment before the warning to fix it. We noticed this now because of Wen's bugfix, where the bug fixed there had previously hidden this other bug. Fixes: 53ad07e ("wifi: cfg80211: support reporting failed links") Signed-off-by: Johannes Berg <[email protected]>
Xilinx · Oct 23, 2023 · c434b2b · c434b2b
1 parent 3e3929e
commit c434b2b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
@@ -43,10 +43,11 @@ void cfg80211_rx_assoc_resp(struct net_device *dev,
 
  for (link_id = 0; link_id < ARRAY_SIZE(data->links); link_id++) {
  cr.links[link_id].status = data->links[link_id].status;
+ cr.links[link_id].bss = data->links[link_id].bss;
+
  WARN_ON_ONCE(cr.links[link_id].status != WLAN_STATUS_SUCCESS &&
  (!cr.ap_mld_addr || !cr.links[link_id].bss));
 
- cr.links[link_id].bss = data->links[link_id].bss;
  if (!cr.links[link_id].bss)
  continue;
  cr.links[link_id].bssid = data->links[link_id].bss->bssid;