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 14dccc3..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
-@@ -228,6 +228,7 @@ struct hostapd_iface {
+@@ -235,6 +235,7 @@ struct hostapd_iface {
        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
-@@ -790,6 +790,9 @@ int hostapd_setup_interface_complete(str
+@@ -804,6 +804,9 @@ int hostapd_setup_interface_complete(str
        wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
                   iface->bss[0]->conf->iface);
  
@@ -22,16 +22,16 @@
  
 --- a/hostapd/main.c
 +++ b/hostapd/main.c
-@@ -35,6 +35,8 @@
+@@ -36,6 +36,8 @@
  extern int wpa_debug_level;
  extern int wpa_debug_show_keys;
  extern int wpa_debug_timestamp;
 +static int daemonize = 0;
 +static char *pid_file = NULL;
  
+ extern struct wpa_driver_ops *wpa_drivers[];
  
- struct hapd_interfaces {
-@@ -162,6 +164,15 @@ static void hostapd_logger_cb(void *ctx,
+@@ -173,6 +175,16 @@ static void hostapd_logger_cb(void *ctx,
  }
  #endif /* CONFIG_NO_HOSTAPD_LOGGER */
  
@@ -42,12 +42,13 @@
 +              return -1;
 +      }
 +      daemonize = 0;
++      return 0;
 +}
 +
  
  /**
   * hostapd_init - Allocate and initialize per-interface data
-@@ -183,6 +194,7 @@ static struct hostapd_iface * hostapd_in
+@@ -194,6 +206,7 @@ static struct hostapd_iface * hostapd_in
        if (hapd_iface == NULL)
                goto fail;
  
@@ -55,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);
-@@ -391,7 +403,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)
  {
- #ifdef EAP_SERVER_TNC
-       tncs_global_deinit();
-@@ -409,8 +421,7 @@ static void hostapd_global_deinit(const 
+       int i;
+ 
+@@ -472,8 +485,7 @@ static void hostapd_global_deinit(const 
  }
  
  
@@ -74,7 +75,7 @@
  {
  #ifdef EAP_SERVER_TNC
        int tnc = 0;
-@@ -431,11 +442,6 @@ static int hostapd_global_run(struct hap
+@@ -494,11 +506,6 @@ static int hostapd_global_run(struct hap
        }
  #endif /* EAP_SERVER_TNC */
  
@@ -86,7 +87,7 @@
        eloop_run();
  
        return 0;
-@@ -491,8 +497,7 @@ int main(int argc, char *argv[])
+@@ -555,8 +562,7 @@ int main(int argc, char *argv[])
        struct hapd_interfaces interfaces;
        int ret = 1;
        size_t i;
@@ -94,9 +95,9 @@
 -      char *pid_file = NULL;
 +      int c, debug = 0;
        const char *log_file = NULL;
+       const char *entropy_file = NULL;
  
-       if (os_program_init())
-@@ -566,7 +571,7 @@ int main(int argc, char *argv[])
+@@ -634,7 +640,7 @@ int main(int argc, char *argv[])
                        goto out;
        }
  
@@ -105,7 +106,7 @@
                goto out;
  
        ret = 0;
-@@ -577,7 +582,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);
  
@@ -116,7 +117,7 @@
        if (log_file)
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -1891,6 +1891,8 @@ struct hostapd_config * hostapd_config_r
+@@ -1925,6 +1925,8 @@ struct hostapd_config * hostapd_config_r
                        }
  #endif /* CONFIG_IEEE80211W */
  #ifdef CONFIG_IEEE80211N
@@ -127,7 +128,7 @@
                } else if (os_strcmp(buf, "ht_capab") == 0) {
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
-@@ -389,6 +389,7 @@ struct hostapd_config {
+@@ -412,6 +412,7 @@ struct hostapd_config {
  
        int ht_op_mode_fixed;
        u16 ht_capab;
@@ -137,7 +138,7 @@
        int require_ht;
 --- a/src/ap/hw_features.c
 +++ b/src/ap/hw_features.c
-@@ -463,7 +463,7 @@ static int ieee80211n_check_40mhz(struct
+@@ -449,7 +449,7 @@ static int ieee80211n_check_40mhz(struct
  {
        struct wpa_driver_scan_params params;