projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: reorganize patches, reset hardware after full sleep (fixes #10349)
[openwrt.git]
/
package
/
hostapd
/
patches
/
500-scan_wait.patch
diff --git
a/package/hostapd/patches/500-scan_wait.patch
b/package/hostapd/patches/500-scan_wait.patch
index
d4c5938
..
4ca3553
100644
(file)
--- a/
package/hostapd/patches/500-scan_wait.patch
+++ b/
package/hostapd/patches/500-scan_wait.patch
@@
-1,6
+1,6
@@
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
-@@ -2
29,6 +229
,7 @@ struct hostapd_iface {
+@@ -2
35,6 +235
,7 @@ struct hostapd_iface {
int (*for_each_interface)(struct hapd_interfaces *interfaces,
int (*cb)(struct hostapd_iface *iface,
void *ctx), void *ctx);
int (*for_each_interface)(struct hapd_interfaces *interfaces,
int (*cb)(struct hostapd_iface *iface,
void *ctx), void *ctx);
@@
-10,7
+10,7
@@
/* hostapd.c */
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
/* hostapd.c */
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
-@@ -80
7,6 +807
,9 @@ int hostapd_setup_interface_complete(str
+@@ -80
4,6 +804
,9 @@ int hostapd_setup_interface_complete(str
wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
iface->bss[0]->conf->iface);
wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
iface->bss[0]->conf->iface);
@@
-29,9
+29,9
@@
+static int daemonize = 0;
+static char *pid_file = NULL;
+static int daemonize = 0;
+static char *pid_file = NULL;
+ extern struct wpa_driver_ops *wpa_drivers[];
- struct hapd_interfaces {
-@@ -163,6 +165,16 @@ static void hostapd_logger_cb(void *ctx,
+@@ -173,6 +175,16 @@ static void hostapd_logger_cb(void *ctx,
}
#endif /* CONFIG_NO_HOSTAPD_LOGGER */
}
#endif /* CONFIG_NO_HOSTAPD_LOGGER */
@@
-48,7
+48,7
@@
/**
* hostapd_init - Allocate and initialize per-interface data
/**
* hostapd_init - Allocate and initialize per-interface data
-@@ -1
84,6 +19
6,7 @@ static struct hostapd_iface * hostapd_in
+@@ -1
94,6 +20
6,7 @@ static struct hostapd_iface * hostapd_in
if (hapd_iface == NULL)
goto fail;
if (hapd_iface == NULL)
goto fail;
@@
-56,16
+56,16
@@
hapd_iface->reload_config = hostapd_reload_config;
hapd_iface->config_read_cb = hostapd_config_read;
hapd_iface->config_fname = os_strdup(config_file);
hapd_iface->reload_config = hostapd_reload_config;
hapd_iface->config_read_cb = hostapd_config_read;
hapd_iface->config_fname = os_strdup(config_file);
-@@ -
399,7 +412
,7 @@ static int hostapd_global_init(struct ha
+@@ -
442,7 +455
,7 @@ static int hostapd_global_init(struct ha
}
-static void hostapd_global_deinit(const char *pid_file)
+static void hostapd_global_deinit(void)
{
}
-static void hostapd_global_deinit(const char *pid_file)
+static void hostapd_global_deinit(void)
{
- #ifdef EAP_SERVER_TNC
- tncs_global_deinit();
-@@ -4
19,8 +432
,7 @@ static void hostapd_global_deinit(const
+ int i;
+
+@@ -4
72,8 +485
,7 @@ static void hostapd_global_deinit(const
}
}
@@
-75,7
+75,7
@@
{
#ifdef EAP_SERVER_TNC
int tnc = 0;
{
#ifdef EAP_SERVER_TNC
int tnc = 0;
-@@ -4
41,11 +453
,6 @@ static int hostapd_global_run(struct hap
+@@ -4
94,11 +506
,6 @@ static int hostapd_global_run(struct hap
}
#endif /* EAP_SERVER_TNC */
}
#endif /* EAP_SERVER_TNC */
@@
-87,7
+87,7
@@
eloop_run();
return 0;
eloop_run();
return 0;
-@@ -5
01,8 +508
,7 @@ int main(int argc, char *argv[])
+@@ -5
55,8 +562
,7 @@ int main(int argc, char *argv[])
struct hapd_interfaces interfaces;
int ret = 1;
size_t i;
struct hapd_interfaces interfaces;
int ret = 1;
size_t i;
@@
-95,9
+95,9
@@
- char *pid_file = NULL;
+ int c, debug = 0;
const char *log_file = NULL;
- char *pid_file = NULL;
+ int c, debug = 0;
const char *log_file = NULL;
+ const char *entropy_file = NULL;
- if (os_program_init())
-@@ -576,7 +582,7 @@ int main(int argc, char *argv[])
+@@ -634,7 +640,7 @@ int main(int argc, char *argv[])
goto out;
}
goto out;
}
@@
-106,7
+106,7
@@
goto out;
ret = 0;
goto out;
ret = 0;
-@@ -
587,7 +593
,7 @@ int main(int argc, char *argv[])
+@@ -
645,7 +651
,7 @@ int main(int argc, char *argv[])
hostapd_interface_deinit_free(interfaces.iface[i]);
os_free(interfaces.iface);
hostapd_interface_deinit_free(interfaces.iface[i]);
os_free(interfaces.iface);
@@
-117,7
+117,7
@@
if (log_file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
if (log_file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
-@@ -1
891,6 +1891
,8 @@ struct hostapd_config * hostapd_config_r
+@@ -1
925,6 +1925
,8 @@ struct hostapd_config * hostapd_config_r
}
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N
}
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_IEEE80211N
@@
-128,7
+128,7
@@
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
} else if (os_strcmp(buf, "ht_capab") == 0) {
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
-@@ -
390,6 +390
,7 @@ struct hostapd_config {
+@@ -
412,6 +412
,7 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;
int ht_op_mode_fixed;
u16 ht_capab;
@@
-138,7
+138,7
@@
int require_ht;
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
int require_ht;
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
-@@ -4
63,7 +463
,7 @@ static int ieee80211n_check_40mhz(struct
+@@ -4
49,7 +449
,7 @@ static int ieee80211n_check_40mhz(struct
{
struct wpa_driver_scan_params params;
{
struct wpa_driver_scan_params params;
This page took
0.026377 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff