From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 24 Oct 2010 00:19:34 +0000 (+0000)
Subject: hostapd: fix AP+STA reconnects
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=4e7081d3fe26ce81f66eecd7935fb6eeeac61432

hostapd: fix AP+STA reconnects

SVN-Revision: 23604
---

diff --git a/package/hostapd/patches/453-ap_sta_support.patch b/package/hostapd/patches/453-ap_sta_support.patch
index c2f4d7c6f0..99c4b0e4f7 100644
--- a/package/hostapd/patches/453-ap_sta_support.patch
+++ b/package/hostapd/patches/453-ap_sta_support.patch
@@ -90,7 +90,7 @@
  /* Configure default/group WEP keys for static WEP */
  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
  {
-@@ -548,6 +597,10 @@ void wpa_supplicant_set_state(struct wpa
+@@ -548,8 +597,14 @@ void wpa_supplicant_set_state(struct wpa
  #ifndef IEEE8021X_EAPOL
  		wpa_drv_set_supp_port(wpa_s, 1);
  #endif
@@ -100,8 +100,12 @@
 +#endif
  	} else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
  		   state == WPA_ASSOCIATED) {
++		if (wpa_s->hostapd)
++			hostapd_stop(wpa_s);
  		wpa_s->new_connection = 1;
-@@ -1957,6 +2010,21 @@ static int wpa_supplicant_init_iface(str
+ 		wpa_drv_set_operstate(wpa_s, 0);
+ #ifndef IEEE8021X_EAPOL
+@@ -1957,6 +2012,21 @@ static int wpa_supplicant_init_iface(str
  		os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
  			   sizeof(wpa_s->bridge_ifname));
  	}