Revert "LinuxKPI: 802.11: fix iwlwifi fw assert with older chipsets"
This reverts commit 013e516dc9
.
This commit is contained in:
parent
942e234d86
commit
9597f7cb99
@ -1509,14 +1509,23 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int
|
||||
vif = LVIF_TO_VIF(lvif);
|
||||
|
||||
IEEE80211_UNLOCK(vap->iv_ic);
|
||||
ni = NULL;
|
||||
|
||||
IMPROVE("ponder some of this moved to ic_newassoc, scan_assoc_success, "
|
||||
"and to lesser extend ieee80211_notify_node_join");
|
||||
|
||||
/* Finish assoc. */
|
||||
/* Update sta_state (AUTH to ASSOC) and set aid. */
|
||||
ni = ieee80211_ref_node(vap->iv_bss);
|
||||
lsta = ni->ni_drv_data;
|
||||
KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni));
|
||||
KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not "
|
||||
"AUTH: %#x\n", __func__, lsta, lsta->state));
|
||||
sta = LSTA_TO_STA(lsta);
|
||||
sta->aid = IEEE80211_NODE_AID(ni);
|
||||
error = lkpi_80211_mo_sta_state(hw, vif, sta, IEEE80211_STA_ASSOC);
|
||||
if (error != 0)
|
||||
goto out;
|
||||
|
||||
IMPROVE("wme / conf_tx [all]");
|
||||
|
||||
@ -1550,16 +1559,6 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int
|
||||
|
||||
lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed);
|
||||
|
||||
/* This MUST come after the bss_info_changed. */
|
||||
/* Finish assoc. */
|
||||
/* Update sta_state (AUTH to ASSOC) and set aid. */
|
||||
KASSERT(lsta->state == IEEE80211_STA_AUTH, ("%s: lsta %p state not "
|
||||
"AUTH: %#x\n", __func__, lsta, lsta->state));
|
||||
sta->aid = IEEE80211_NODE_AID(ni);
|
||||
error = lkpi_80211_mo_sta_state(hw, vif, sta, IEEE80211_STA_ASSOC);
|
||||
if (error != 0)
|
||||
goto out;
|
||||
|
||||
/* - change_chanctx (if needed)
|
||||
* - event_callback
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user