projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update to 2013-04-05
[openwrt/svn-archive/archive.git]
/
package
/
network
/
services
/
hostapd
/
patches
/
480-terminate_on_setup_failure.patch
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
index f9d7425965229d7708f06bd46c76503ff94dba51..3f8a7783ba96055a630ca22d5ef0600b63924697 100644
(file)
--- a/
package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch
+++ b/
package/network/services/hostapd/patches/480-terminate_on_setup_failure.patch
@@
-1,6
+1,6
@@
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -
895,11 +895
,8 @@ int hostapd_setup_interface_complete(str
+@@ -
911,11 +911
,8 @@ int hostapd_setup_interface_complete(str
size_t j;
u8 *prev_addr;
size_t j;
u8 *prev_addr;
@@
-14,7
+14,7
@@
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (hapd->iconf->channel) {
wpa_printf(MSG_DEBUG, "Completing interface initialization");
if (hapd->iconf->channel) {
-@@ -9
19,7 +916
,7 @@ int hostapd_setup_interface_complete(str
+@@ -9
35,7 +932
,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");
hapd->iconf->vht_oper_centr_freq_seg1_idx)) {
wpa_printf(MSG_ERROR, "Could not set channel for "
"kernel driver");
@@
-23,7
+23,7
@@
}
}
}
}
-@@ -9
30,7 +927
,7 @@ int hostapd_setup_interface_complete(str
+@@ -9
46,7 +943
,7 @@ int hostapd_setup_interface_complete(str
hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_WARNING,
"Failed to prepare rates table.");
hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_WARNING,
"Failed to prepare rates table.");
@@
-32,7
+32,7
@@
}
}
}
}
-@@ -9
38,14 +935
,14 @@ int hostapd_setup_interface_complete(str
+@@ -9
54,14 +951
,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");
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;
}
prev_addr = hapd->own_addr;
-@@ -9
55,7 +952
,7 @@ int hostapd_setup_interface_complete(str
+@@ -9
71,7 +968
,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))
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;
}
if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
prev_addr = hapd->own_addr;
}
-@@ -9
67,7 +964
,7 @@ int hostapd_setup_interface_complete(str
+@@ -9
83,7 +980
,7 @@ int hostapd_setup_interface_complete(str
if (hostapd_driver_commit(hapd) < 0) {
wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
"configuration", __func__);
if (hostapd_driver_commit(hapd) < 0) {
wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
"configuration", __func__);
@@
-67,7
+67,7
@@
}
/*
}
/*
-@@ -
988,6 +985
,11 @@ int hostapd_setup_interface_complete(str
+@@ -
1004,6 +1001
,11 @@ int hostapd_setup_interface_complete(str
iface->bss[0]->conf->iface);
return 0;
iface->bss[0]->conf->iface);
return 0;