diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2017-09-05 09:56:22 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-10-07 05:46:04 +0300 |
| commit | 2f78034c3ef71bdeb1f2955aa8844b1d1ec70d3a (patch) | |
| tree | 1635cd5f7c7284ef2f3482f3afa61678bb31361f /package/network/services/hostapd/patches/370-ap_sta_support.patch | |
| parent | bd27331eeaf6cd1db9ad5b44c4f0f10f03b7911f (diff) | |
| download | upstream-2f78034c3ef71bdeb1f2955aa8844b1d1ec70d3a.tar.gz upstream-2f78034c3ef71bdeb1f2955aa8844b1d1ec70d3a.tar.bz2 upstream-2f78034c3ef71bdeb1f2955aa8844b1d1ec70d3a.zip | |
hostapd: update to version 2017-08-24
- Deleted upstreamed patches & parts
- Refreshed all
Compile tested: full-option package + tools (hostapd + wpa_supplicant)
Run-tested: hostapd wpa2 hotspot & wpa_supplicant IBSS link
Targets: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'package/network/services/hostapd/patches/370-ap_sta_support.patch')
| -rw-r--r-- | package/network/services/hostapd/patches/370-ap_sta_support.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/network/services/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch index 03819b3372..ea31371235 100644 --- a/package/network/services/hostapd/patches/370-ap_sta_support.patch +++ b/package/network/services/hostapd/patches/370-ap_sta_support.patch @@ -1,6 +1,6 @@ --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h -@@ -100,6 +100,11 @@ struct wpa_interface { +@@ -101,6 +101,11 @@ struct wpa_interface { const char *ifname; /** @@ -12,7 +12,7 @@ * bridge_ifname - Optional bridge interface name * * If the driver interface (ifname) is included in a Linux bridge -@@ -484,6 +489,8 @@ struct wpa_supplicant { +@@ -512,6 +517,8 @@ struct wpa_supplicant { #endif /* CONFIG_CTRL_IFACE_BINDER */ char bridge_ifname[16]; @@ -34,7 +34,7 @@ -include .config -include $(if $(MULTICALL),../hostapd/.config) -@@ -115,6 +119,8 @@ OBJS_c += ../src/utils/common.o +@@ -117,6 +121,8 @@ OBJS_c += ../src/utils/common.o OBJS_c += ../src/common/cli.o OBJS += wmm_ac.o @@ -45,9 +45,9 @@ CONFIG_OS=win32 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c -@@ -112,6 +112,55 @@ const char *const wpa_supplicant_full_li - "\n"; - #endif /* CONFIG_NO_STDOUT_DEBUG */ +@@ -118,6 +118,55 @@ const char *const wpa_supplicant_full_li + static void wpa_bss_tmp_disallow_timeout(void *eloop_ctx, void *timeout_ctx); + +static int hostapd_stop(struct wpa_supplicant *wpa_s) +{ @@ -101,7 +101,7 @@ /* Configure default/group WEP keys for static WEP */ int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { -@@ -819,8 +868,12 @@ void wpa_supplicant_set_state(struct wpa +@@ -883,8 +932,12 @@ void wpa_supplicant_set_state(struct wpa wpas_p2p_completed(wpa_s); sme_sched_obss_scan(wpa_s, 1); @@ -114,7 +114,7 @@ wpa_s->new_connection = 1; wpa_drv_set_operstate(wpa_s, 0); #ifndef IEEE8021X_EAPOL -@@ -4790,6 +4843,20 @@ static int wpa_supplicant_init_iface(str +@@ -5080,6 +5133,20 @@ static int wpa_supplicant_init_iface(str sizeof(wpa_s->bridge_ifname)); } @@ -135,7 +135,7 @@ /* RSNA Supplicant Key Management - INITIALIZE */ eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); eapol_sm_notify_portValid(wpa_s->eapol, FALSE); -@@ -5083,6 +5150,11 @@ static void wpa_supplicant_deinit_iface( +@@ -5404,6 +5471,11 @@ static void wpa_supplicant_deinit_iface( if (terminate) wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); @@ -157,7 +157,7 @@ #include "drivers/driver.h" #include "eap_peer/eap.h" #include "wpa_supplicant_i.h" -@@ -290,6 +291,10 @@ static void calculate_update_time(const +@@ -290,6 +291,10 @@ void calculate_update_time(const struct static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, struct os_reltime *fetch_time) { |