diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-09-06 10:53:17 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-09-08 15:28:38 +0200 |
commit | 859d940c79e8cb1c66a3d0cccc18e9eac499415b (patch) | |
tree | 016725b81c9bd82e7e3d2df085387967525abe5a /package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch | |
parent | b6cd42a54e901f21d47f52a6e7a61bab83a50f3b (diff) | |
download | upstream-859d940c79e8cb1c66a3d0cccc18e9eac499415b.tar.gz upstream-859d940c79e8cb1c66a3d0cccc18e9eac499415b.tar.bz2 upstream-859d940c79e8cb1c66a3d0cccc18e9eac499415b.zip |
hostapd: update to version 2016-09-05
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch')
-rw-r--r-- | package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch index 9e815e96a1..c6e7cd60fb 100644 --- a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch +++ b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch @@ -1,6 +1,6 @@ --- a/hostapd/Makefile +++ b/hostapd/Makefile -@@ -212,6 +212,9 @@ endif +@@ -215,6 +215,9 @@ endif ifdef CONFIG_NO_CTRL_IFACE CFLAGS += -DCONFIG_NO_CTRL_IFACE else @@ -12,7 +12,7 @@ else --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c -@@ -2342,6 +2342,7 @@ static int hostapd_ctrl_iface_receive_pr +@@ -2364,6 +2364,7 @@ static int hostapd_ctrl_iface_receive_pr reply_size); } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) { reply_len = hostapd_drv_status(hapd, reply, reply_size); @@ -20,7 +20,7 @@ } else if (os_strcmp(buf, "MIB") == 0) { reply_len = ieee802_11_get_mib(hapd, reply, reply_size); if (reply_len >= 0) { -@@ -2383,6 +2384,7 @@ static int hostapd_ctrl_iface_receive_pr +@@ -2405,6 +2406,7 @@ static int hostapd_ctrl_iface_receive_pr } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply, reply_size); @@ -30,7 +30,7 @@ reply_len = -1; --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile -@@ -874,6 +874,9 @@ ifdef CONFIG_MBO +@@ -875,6 +875,9 @@ ifdef CONFIG_MBO OBJS += ../src/ap/mbo_ap.o endif ifdef CONFIG_CTRL_IFACE @@ -51,7 +51,7 @@ if (wpa_s->ap_iface) { pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos, end - pos, -@@ -8687,6 +8687,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -8684,6 +8684,7 @@ char * wpa_supplicant_ctrl_iface_process reply_len = -1; } else if (os_strncmp(buf, "NOTE ", 5) == 0) { wpa_printf(MSG_INFO, "NOTE: %s", buf + 5); @@ -59,7 +59,7 @@ } else if (os_strcmp(buf, "MIB") == 0) { reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); if (reply_len >= 0) { -@@ -8694,6 +8695,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -8691,6 +8692,7 @@ char * wpa_supplicant_ctrl_iface_process reply + reply_len, reply_size - reply_len); } @@ -67,7 +67,7 @@ } else if (os_strncmp(buf, "STATUS", 6) == 0) { reply_len = wpa_supplicant_ctrl_iface_status( wpa_s, buf + 6, reply, reply_size); -@@ -9164,6 +9166,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -9161,6 +9163,7 @@ char * wpa_supplicant_ctrl_iface_process reply_len = wpa_supplicant_ctrl_iface_bss( wpa_s, buf + 4, reply, reply_size); #ifdef CONFIG_AP @@ -75,7 +75,7 @@ } else if (os_strcmp(buf, "STA-FIRST") == 0) { reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size); } else if (os_strncmp(buf, "STA ", 4) == 0) { -@@ -9172,12 +9175,15 @@ char * wpa_supplicant_ctrl_iface_process +@@ -9169,12 +9172,15 @@ char * wpa_supplicant_ctrl_iface_process } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) { reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply, reply_size); @@ -111,7 +111,7 @@ static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype, --- a/src/ap/ieee802_1x.c +++ b/src/ap/ieee802_1x.c -@@ -2441,6 +2441,7 @@ static const char * bool_txt(Boolean val +@@ -2442,6 +2442,7 @@ static const char * bool_txt(Boolean val return val ? "TRUE" : "FALSE"; } @@ -119,7 +119,7 @@ int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen) { -@@ -2616,6 +2617,7 @@ int ieee802_1x_get_mib_sta(struct hostap +@@ -2617,6 +2618,7 @@ int ieee802_1x_get_mib_sta(struct hostap return len; } @@ -167,7 +167,7 @@ --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c -@@ -1114,7 +1114,7 @@ int wpas_ap_wps_nfc_report_handover(stru +@@ -1119,7 +1119,7 @@ int wpas_ap_wps_nfc_report_handover(stru #endif /* CONFIG_WPS */ |