backport mac80211, hostapd, iw, crda from trunk as of r26369

[openwrt-10.03/.git] / package / hostapd / patches / 552-ctrl_iface_reload.patch

diff --git a/package/hostapd/patches/452-ctrl_iface_reload.patch b/package/hostapd/patches/552-ctrl_iface_reload.patch
similarity index 84%
rename from package/hostapd/patches/452-ctrl_iface_reload.patch
rename to package/hostapd/patches/552-ctrl_iface_reload.patch
index e07ab6d440d7cce6fcfe46bd15189682b43d4bee..a780f7dca9418655a802d2412db040b4ea60b744 100644 (file)
--- a/package/hostapd/patches/452-ctrl_iface_reload.patch
+++ b/package/hostapd/patches/552-ctrl_iface_reload.patch
@@ -1,14 +1,14 @@
 --- a/hostapd/ctrl_iface.c
 +++ b/hostapd/ctrl_iface.c
-@@ -35,6 +35,7 @@
- #include "ap/wps_hostapd.h"
- #include "ap/ctrl_iface_ap.h"
+@@ -39,6 +39,7 @@
+ #include "wps/wps_defs.h"
+ #include "wps/wps.h"
  #include "ctrl_iface.h"
 +#include "config_file.h"
  
  
  struct wpa_ctrl_dst {
-@@ -45,6 +46,7 @@ struct wpa_ctrl_dst {
+@@ -49,6 +50,7 @@ struct wpa_ctrl_dst {
        int errors;
  };
  
@@ -16,9 +16,9 @@
  
  static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level,
                                    const char *buf, size_t len);
-@@ -315,6 +317,66 @@ static int hostapd_ctrl_iface_wps_oob(st
- #endif /* CONFIG_WPS_OOB */
- #endif /* CONFIG_WPS */
+@@ -323,6 +325,66 @@ static int hostapd_ctrl_iface_disassocia
+       return 0;
+ }
  
 +static int hostapd_ctrl_iface_set_down(struct hostapd_data *hapd)
 +{
@@ -81,9 +81,9 @@
 +      iface->config_read_cb = hostapd_config_read;
 +}
  
- static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
-                                      void *sock_ctx)
-@@ -379,6 +441,10 @@ static void hostapd_ctrl_iface_receive(i
+ #ifdef CONFIG_IEEE80211W
+ #ifdef NEED_AP_MLME
+@@ -822,6 +884,10 @@ static void hostapd_ctrl_iface_receive(i
                                reply_len += res;
                }
  #endif /* CONFIG_NO_RADIUS */