projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: ag71xx: make switch register access atomic
[openwrt.git]
/
package
/
hostapd
/
patches
/
600-terminate_on_setup_failure.patch
diff --git
a/package/hostapd/patches/600-terminate_on_setup_failure.patch
b/package/hostapd/patches/600-terminate_on_setup_failure.patch
index
cc0f95e
..
63d3ec5
100644
(file)
--- a/
package/hostapd/patches/600-terminate_on_setup_failure.patch
+++ b/
package/hostapd/patches/600-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
-@@ -7
09,11 +709
,8 @@ int hostapd_setup_interface_complete(str
+@@ -7
17,11 +717
,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) {
-@@ -7
29,7 +726
,7 @@ int hostapd_setup_interface_complete(str
+@@ -7
37,7 +734
,7 @@ int hostapd_setup_interface_complete(str
hapd->iconf->secondary_channel)) {
wpa_printf(MSG_ERROR, "Could not set channel for "
"kernel driver");
hapd->iconf->secondary_channel)) {
wpa_printf(MSG_ERROR, "Could not set channel for "
"kernel driver");
@@
-23,7
+23,7
@@
}
}
}
}
-@@ -74
0,7 +737
,7 @@ int hostapd_setup_interface_complete(str
+@@ -74
8,7 +745
,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
@@
}
}
}
}
-@@ -7
48,14 +745
,14 @@ int hostapd_setup_interface_complete(str
+@@ -7
56,14 +753
,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;
-@@ -7
65,7 +762
,7 @@ int hostapd_setup_interface_complete(str
+@@ -7
73,7 +770
,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;
}
-@@ -7
77,7 +774
,7 @@ int hostapd_setup_interface_complete(str
+@@ -7
85,7 +782
,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__);
@@
-66,8
+66,8
@@
+ goto error;
}
+ goto error;
}
- wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
-@@ -7
87,6 +784
,11 @@ int hostapd_setup_interface_complete(str
+ if (hapd->setup_complete_cb)
+@@ -7
98,6 +795
,11 @@ int hostapd_setup_interface_complete(str
iface->init_complete(iface);
return 0;
iface->init_complete(iface);
return 0;
This page took
0.024803 seconds
and
4
git commands to generate.