madwifi: revert part of the noderef fix patch
SVN-Revision: 12771
This commit is contained in:
parent
dcca20be51
commit
72fd7feb0d
1 changed files with 0 additions and 19 deletions
|
@ -26,23 +26,4 @@
|
||||||
("wrong refcount for new node."));
|
("wrong refcount for new node."));
|
||||||
|
|
||||||
if (obss != NULL) {
|
if (obss != NULL) {
|
||||||
@@ -630,6 +630,7 @@
|
|
||||||
ieee80211_fix_rate(selbs, IEEE80211_F_DODEL);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ IEEE80211_VAPS_LOCK_BH(ic);
|
|
||||||
/*
|
|
||||||
* Committed to selbs, setup state.
|
|
||||||
*/
|
|
||||||
@@ -642,8 +643,9 @@
|
|
||||||
(vap->iv_state == IEEE80211_S_RUN) && bssid_equal(obss, selbs)); */
|
|
||||||
vap->iv_bss = selbs;
|
|
||||||
IEEE80211_ADDR_COPY(vap->iv_bssid, selbs->ni_bssid);
|
|
||||||
- if (obss != NULL)
|
|
||||||
+ if ((obss != NULL) && (obss != selbs))
|
|
||||||
ieee80211_unref_node(&obss);
|
|
||||||
+ IEEE80211_VAPS_UNLOCK_BH(ic);
|
|
||||||
ic->ic_bsschan = selbs->ni_chan;
|
|
||||||
ic->ic_curchan = ic->ic_bsschan;
|
|
||||||
ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue