From 0ef8b98c7e043f76f5d29a402b9408611c57510f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 23 Sep 2009 13:32:38 +0000
Subject: [PATCH] madwifi: fix sta mode reconnect when roaming between
 different aps of the same essid

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17688 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../madwifi/patches/447-sta_reconnect.patch   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/madwifi/patches/447-sta_reconnect.patch

diff --git a/package/madwifi/patches/447-sta_reconnect.patch b/package/madwifi/patches/447-sta_reconnect.patch
new file mode 100644
index 000000000..e6f019ef7
--- /dev/null
+++ b/package/madwifi/patches/447-sta_reconnect.patch
@@ -0,0 +1,33 @@
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
+@@ -647,8 +647,11 @@ ieee80211_sta_join1(struct ieee80211_nod
+ 		(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) {
++		if (obss->ni_table)
++			ieee80211_node_leave(obss);
+ 		ieee80211_unref_node(&obss);
++	}
+ 	ic->ic_bsschan = selbs->ni_chan;
+ 	ic->ic_curchan = ic->ic_bsschan;
+ 	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);
+ 			break;
+ 		case IEEE80211_S_RUN:		/* beacon miss */
+ 			if (vap->iv_opmode == IEEE80211_M_STA) {