summaryrefslogtreecommitdiffstats
path: root/package/madwifi/patches/447-sta_reconnect.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-14 08:29:37 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-14 08:29:37 +0000
commitd2478832c99e24b63591de616382232df46588f5 (patch)
tree89bcb86ab23de51bfc2438b59ba28baf8e733b1b /package/madwifi/patches/447-sta_reconnect.patch
parent798bb2a9c8239ee6e0e647da4f96c6a90a55c3db (diff)
madwifi: beacon timer fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18045 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi/patches/447-sta_reconnect.patch')
-rw-r--r--package/madwifi/patches/447-sta_reconnect.patch22
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 e6f019ef7..960d1b8ed 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 ?