summaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches/480-terminate_on_setup_failure.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-13 12:38:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-13 12:38:51 +0000
commit4de49556229ab45d25030752041a39aacaf30d7e (patch)
tree9bb15ad13013f4013dbcb56b2e17a04ab3eb6c77 /package/hostapd/patches/480-terminate_on_setup_failure.patch
parent85796641083642a4461d24ef4dd7f9a39681b4c0 (diff)
hostapd: update to 2012-09-10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hostapd/patches/480-terminate_on_setup_failure.patch')
-rw-r--r--package/hostapd/patches/480-terminate_on_setup_failure.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/hostapd/patches/480-terminate_on_setup_failure.patch b/package/hostapd/patches/480-terminate_on_setup_failure.patch
index 31ce3eb92..6168a5cfc 100644
--- a/package/hostapd/patches/480-terminate_on_setup_failure.patch
+++ b/package/hostapd/patches/480-terminate_on_setup_failure.patch
@@ -1,6 +1,6 @@
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -778,11 +778,8 @@ int hostapd_setup_interface_complete(str
+@@ -886,11 +886,8 @@ int hostapd_setup_interface_complete(str
size_t j;
u8 *prev_addr;
@@ -14,7 +14,7 @@
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (hapd->iconf->channel) {
-@@ -798,7 +795,7 @@ int hostapd_setup_interface_complete(str
+@@ -906,7 +903,7 @@ int hostapd_setup_interface_complete(str
hapd->iconf->secondary_channel)) {
wpa_printf(MSG_ERROR, "Could not set channel for "
"kernel driver");
@@ -23,7 +23,7 @@
}
}
-@@ -809,7 +806,7 @@ int hostapd_setup_interface_complete(str
+@@ -917,7 +914,7 @@ int hostapd_setup_interface_complete(str
hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_WARNING,
"Failed to prepare rates table.");
@@ -32,7 +32,7 @@
}
}
-@@ -817,14 +814,14 @@ int hostapd_setup_interface_complete(str
+@@ -925,14 +922,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");
@@ -49,7 +49,7 @@
}
prev_addr = hapd->own_addr;
-@@ -834,7 +831,7 @@ int hostapd_setup_interface_complete(str
+@@ -942,7 +939,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))
@@ -58,7 +58,7 @@
if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
prev_addr = hapd->own_addr;
}
-@@ -846,7 +843,7 @@ int hostapd_setup_interface_complete(str
+@@ -954,7 +951,7 @@ int hostapd_setup_interface_complete(str
if (hostapd_driver_commit(hapd) < 0) {
wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
"configuration", __func__);
@@ -67,8 +67,8 @@
}
/*
-@@ -870,6 +867,11 @@ int hostapd_setup_interface_complete(str
- iface->init_complete(iface);
+@@ -975,6 +972,11 @@ int hostapd_setup_interface_complete(str
+ iface->bss[0]->conf->iface);
return 0;
+