1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 00:04:05 +02:00

hostapd: fix wpa_supplicant standalone compile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23625 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-10-24 21:31:05 +00:00
parent 1baa5e8c46
commit 4bf9ff2029

View File

@ -90,7 +90,7 @@
/* Configure default/group WEP keys for static WEP */ /* Configure default/group WEP keys for static WEP */
int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
{ {
@@ -548,8 +597,14 @@ void wpa_supplicant_set_state(struct wpa @@ -548,8 +597,16 @@ void wpa_supplicant_set_state(struct wpa
#ifndef IEEE8021X_EAPOL #ifndef IEEE8021X_EAPOL
wpa_drv_set_supp_port(wpa_s, 1); wpa_drv_set_supp_port(wpa_s, 1);
#endif #endif
@ -100,12 +100,14 @@
+#endif +#endif
} else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING || } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING ||
state == WPA_ASSOCIATED) { state == WPA_ASSOCIATED) {
+#ifdef MULTICALL
+ if (wpa_s->hostapd) + if (wpa_s->hostapd)
+ hostapd_stop(wpa_s); + hostapd_stop(wpa_s);
+#endif
wpa_s->new_connection = 1; wpa_s->new_connection = 1;
wpa_drv_set_operstate(wpa_s, 0); wpa_drv_set_operstate(wpa_s, 0);
#ifndef IEEE8021X_EAPOL #ifndef IEEE8021X_EAPOL
@@ -1957,6 +2012,21 @@ static int wpa_supplicant_init_iface(str @@ -1957,6 +2014,21 @@ static int wpa_supplicant_init_iface(str
os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname, os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
sizeof(wpa_s->bridge_ifname)); sizeof(wpa_s->bridge_ifname));
} }