diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-11-25 15:43:15 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-11-25 15:43:15 +0000 |
commit | 1d75f7506df7518d59b9d3c5297feb93f0828917 (patch) | |
tree | 3b0d0268e63835e64fb2d6f1ec2eebfc809a39dc /package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch | |
parent | 48de8ed52aa89fd7951cee067005b97440709863 (diff) | |
download | upstream-1d75f7506df7518d59b9d3c5297feb93f0828917.tar.gz upstream-1d75f7506df7518d59b9d3c5297feb93f0828917.tar.bz2 upstream-1d75f7506df7518d59b9d3c5297feb93f0828917.zip |
hostapd: update to version 2013-11-20
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 38914
Diffstat (limited to 'package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch')
-rw-r--r-- | package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch b/package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch deleted file mode 100644 index a8f395237c..0000000000 --- a/package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/src/ap/hostapd.c -+++ b/src/ap/hostapd.c -@@ -951,11 +951,8 @@ int hostapd_setup_interface_complete(str - size_t j; - u8 *prev_addr; - -- if (err) { -- wpa_printf(MSG_ERROR, "Interface initialization failed"); -- eloop_terminate(); -- return -1; -- } -+ if (err) -+ goto error; - - wpa_printf(MSG_DEBUG, "Completing interface initialization"); - if (hapd->iconf->channel) { -@@ -975,7 +972,7 @@ int hostapd_setup_interface_complete(str - hapd->iconf->vht_oper_centr_freq_seg1_idx)) { - wpa_printf(MSG_ERROR, "Could not set channel for " - "kernel driver"); -- return -1; -+ goto error; - } - } - -@@ -986,7 +983,7 @@ int hostapd_setup_interface_complete(str - hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, - HOSTAPD_LEVEL_WARNING, - "Failed to prepare rates table."); -- return -1; -+ goto error; - } - } - -@@ -994,14 +991,14 @@ int hostapd_setup_interface_complete(str - hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) { - wpa_printf(MSG_ERROR, "Could not set RTS threshold for " - "kernel driver"); -- return -1; -+ goto error; - } - - if (hapd->iconf->fragm_threshold > -1 && - hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) { - wpa_printf(MSG_ERROR, "Could not set fragmentation threshold " - "for kernel driver"); -- return -1; -+ goto error; - } - - prev_addr = hapd->own_addr; -@@ -1011,7 +1008,7 @@ int hostapd_setup_interface_complete(str - if (j) - os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN); - if (hostapd_setup_bss(hapd, j == 0)) -- return -1; -+ goto error; - if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0) - prev_addr = hapd->own_addr; - } -@@ -1025,7 +1022,7 @@ int hostapd_setup_interface_complete(str - if (hostapd_driver_commit(hapd) < 0) { - wpa_printf(MSG_ERROR, "%s: Failed to commit driver " - "configuration", __func__); -- return -1; -+ goto error; - } - - /* -@@ -1046,6 +1043,11 @@ int hostapd_setup_interface_complete(str - iface->bss[0]->conf->iface); - - return 0; -+ -+error: -+ wpa_printf(MSG_ERROR, "Interface initialization failed"); -+ eloop_terminate(); -+ return -1; - } - - |