madwifi: fix sta mode reconnect when roaming between different aps of the same essid
[openwrt/openwrt.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 @@ -1512,14 +1512,13 @@ __ieee80211_newstate(struct ieee80211vap
19 if (arg != 0)
20 ieee80211_scan_assoc_fail(ic,
21 vap->iv_bss->ni_macaddr, arg);
22 + ieee80211_node_leave(vap->iv_bss);
23 if (ic->ic_roaming == IEEE80211_ROAMING_AUTO)
24 ieee80211_check_scan(vap,
25 IEEE80211_SCAN_ACTIVE,
26 IEEE80211_SCAN_FOREVER,
27 vap->iv_des_nssid, vap->iv_des_ssid,
28 NULL);
29 - else
30 - ieee80211_node_leave(vap->iv_bss);
31 break;
32 case IEEE80211_S_RUN: /* beacon miss */
33 if (vap->iv_opmode == IEEE80211_M_STA) {