brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / hostapd / patches / 553-ap_sta_support.patch

diff --git a/package/hostapd/patches/553-ap_sta_support.patch b/package/hostapd/patches/553-ap_sta_support.patch
index 765fdff..dfc24c4 100644 (file)
--- a/package/hostapd/patches/553-ap_sta_support.patch
+++ b/package/hostapd/patches/553-ap_sta_support.patch
@@ -20,9 +20,9 @@
        int countermeasures;
 --- a/wpa_supplicant/Makefile
 +++ b/wpa_supplicant/Makefile
        int countermeasures;
 --- a/wpa_supplicant/Makefile
 +++ b/wpa_supplicant/Makefile

-@@ -51,6 +51,11 @@ OBJS_p += ../src/utils/wpa_debug.o
- OBJS_p += ../src/utils/wpabuf.o
+@@ -52,6 +52,11 @@ OBJS_p += ../src/utils/wpabuf.o

  OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
  OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o

+ OBJS_c += ../src/utils/wpa_debug.o

  
 +ifdef MULTICALL
 +OBJS += ../src/common/wpa_ctrl.o
  
 +ifdef MULTICALL
 +OBJS += ../src/common/wpa_ctrl.o


@@ -34,7 +34,7 @@
  
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
  
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c

-@@ -122,6 +122,55 @@ extern int wpa_debug_show_keys;
+@@ -123,6 +123,55 @@ extern int wpa_debug_show_keys;

  extern int wpa_debug_timestamp;
  extern struct wpa_driver_ops *wpa_drivers[];
  
  extern int wpa_debug_timestamp;
  extern struct wpa_driver_ops *wpa_drivers[];
  


@@ -90,7 +90,7 @@
  /* Configure default/group WEP keys for static WEP */
  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
  {
  /* Configure default/group WEP keys for static WEP */
  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
  {

-@@ -557,8 +606,16 @@ void wpa_supplicant_set_state(struct wpa
+@@ -598,8 +647,16 @@ void wpa_supplicant_set_state(struct wpa

  #ifdef CONFIG_P2P
                wpas_p2p_completed(wpa_s);
  #endif /* CONFIG_P2P */
  #ifdef CONFIG_P2P
                wpas_p2p_completed(wpa_s);
  #endif /* CONFIG_P2P */


@@ -107,7 +107,7 @@
                wpa_s->new_connection = 1;
                wpa_drv_set_operstate(wpa_s, 0);
  #ifndef IEEE8021X_EAPOL
                wpa_s->new_connection = 1;
                wpa_drv_set_operstate(wpa_s, 0);
  #ifndef IEEE8021X_EAPOL

-@@ -2027,6 +2084,21 @@ static int wpa_supplicant_init_iface(str
+@@ -2157,6 +2214,21 @@ static int wpa_supplicant_init_iface(str

                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
                           sizeof(wpa_s->bridge_ifname));
        }
                os_strlcpy(wpa_s->bridge_ifname, iface->bridge_ifname,
                           sizeof(wpa_s->bridge_ifname));
        }


@@ -139,7 +139,7 @@
  #include "drivers/driver.h"
  #include "wpa_supplicant_i.h"
  #include "config.h"
  #include "drivers/driver.h"
  #include "wpa_supplicant_i.h"
  #include "config.h"

-@@ -89,6 +90,8 @@ struct wpa_bss * wpa_bss_get(struct wpa_
+@@ -70,6 +71,8 @@ struct wpa_bss * wpa_bss_get(struct wpa_

  
  static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src)
  {
  
  static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src)
  {


@@ -148,7 +148,7 @@
        os_time_t usec;
  
        dst->flags = src->flags;
        os_time_t usec;
  
        dst->flags = src->flags;

-@@ -101,6 +104,12 @@ static void wpa_bss_copy_res(struct wpa_
+@@ -82,6 +85,12 @@ static void wpa_bss_copy_res(struct wpa_

        dst->level = src->level;
        dst->tsf = src->tsf;
  
        dst->level = src->level;
        dst->tsf = src->tsf;