hostapd: fix AP+STA reconnects

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23604 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/patches/453-ap_sta_support.patch b/package/hostapd/patches/453-ap_sta_support.patch
index c2f4d7c..99c4b0e 100644 (file)
--- 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)
  {
  /* 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
  #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) {
 +#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;
                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));
        }
                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
                           sizeof(wpa_s->bridge_ifname));
        }