madwifi: merge fixes from trunk
[openwrt/svn-archive/archive.git] / package / madwifi / patches / 447-sta_reconnect.patch
1 --- a/net80211/ieee80211_node.c
2 +++ b/net80211/ieee80211_node.c
3 @@ -647,8 +647,11 @@ ieee80211_sta_join1(struct ieee80211_nod
4 (vap->iv_state == IEEE80211_S_RUN) && bssid_equal(obss, selbs)); */
5 vap->iv_bss = selbs;
6 IEEE80211_ADDR_COPY(vap->iv_bssid, selbs->ni_bssid);
7 - if (obss != NULL)
8 + if (obss != NULL) {
9 + if (obss->ni_table)
10 + ieee80211_node_leave(obss);
11 ieee80211_unref_node(&obss);
12 + }
13 ic->ic_bsschan = selbs->ni_chan;
14 ic->ic_curchan = ic->ic_bsschan;
15 ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan);
16 --- a/net80211/ieee80211_proto.c
17 +++ b/net80211/ieee80211_proto.c
18 @@ -1602,7 +1602,6 @@ __ieee80211_newstate(struct ieee80211vap
19 IEEE80211_FC0_SUBTYPE_ASSOC_REQ, 0);
20 break;
21 case IEEE80211_S_RUN:
22 - ieee80211_node_leave(ni);
23 if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) {
24 /* NB: caller specifies ASSOC/REASSOC by arg */
25 IEEE80211_SEND_MGMT(ni, arg ?