diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-10-14 08:29:37 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-14 08:29:37 +0000 |
commit | 025ac2b36937e61a961c31718db980f1e021ddfe (patch) | |
tree | c3cd1c0da496d0bf8918bcbca2f8a11c72ecca90 /package/madwifi/patches/447-sta_reconnect.patch | |
parent | 3b048781ea59950c086e7836a1492e501a8cdd4a (diff) | |
download | upstream-025ac2b36937e61a961c31718db980f1e021ddfe.tar.gz upstream-025ac2b36937e61a961c31718db980f1e021ddfe.tar.bz2 upstream-025ac2b36937e61a961c31718db980f1e021ddfe.zip |
madwifi: beacon timer fixes
SVN-Revision: 18045
Diffstat (limited to 'package/madwifi/patches/447-sta_reconnect.patch')
-rw-r--r-- | package/madwifi/patches/447-sta_reconnect.patch | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/package/madwifi/patches/447-sta_reconnect.patch b/package/madwifi/patches/447-sta_reconnect.patch index e6f019ef75..960d1b8ed8 100644 --- a/package/madwifi/patches/447-sta_reconnect.patch +++ b/package/madwifi/patches/447-sta_reconnect.patch @@ -15,19 +15,11 @@ ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan); --- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c -@@ -1512,14 +1512,13 @@ __ieee80211_newstate(struct ieee80211vap - if (arg != 0) - ieee80211_scan_assoc_fail(ic, - vap->iv_bss->ni_macaddr, arg); -+ ieee80211_node_leave(vap->iv_bss); - if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) - ieee80211_check_scan(vap, - IEEE80211_SCAN_ACTIVE, - IEEE80211_SCAN_FOREVER, - vap->iv_des_nssid, vap->iv_des_ssid, - NULL); -- else -- ieee80211_node_leave(vap->iv_bss); +@@ -1602,7 +1602,6 @@ __ieee80211_newstate(struct ieee80211vap + IEEE80211_FC0_SUBTYPE_ASSOC_REQ, 0); break; - case IEEE80211_S_RUN: /* beacon miss */ - if (vap->iv_opmode == IEEE80211_M_STA) { + case IEEE80211_S_RUN: +- ieee80211_node_leave(ni); + if (ic->ic_roaming == IEEE80211_ROAMING_AUTO) { + /* NB: caller specifies ASSOC/REASSOC by arg */ + IEEE80211_SEND_MGMT(ni, arg ? |