hostapd: update to 20110117

[openwrt/openwrt.git] / package / hostapd / patches / 510-multicall.patch

diff --git a/package/hostapd/patches/510-multicall.patch b/package/hostapd/patches/510-multicall.patch
index 80a032e5abbf5a807ed079df017968985bcbf038..4e239c2969b40fbd2fe52c5bb25b0e60ccf77db0 100644 (file)
--- a/package/hostapd/patches/510-multicall.patch
+++ b/package/hostapd/patches/510-multicall.patch
@@ -8,7 +8,7 @@
  
  ifndef CONFIG_OS
  ifdef CONFIG_NATIVE_WINDOWS
-@@ -157,10 +158,14 @@ ifdef CONFIG_IEEE80211N
+@@ -159,10 +160,14 @@ ifdef CONFIG_IEEE80211N
  CFLAGS += -DCONFIG_IEEE80211N
  endif
  
@@ -26,7 +26,7 @@
  LIBS += $(DRV_AP_LIBS)
  
  ifdef CONFIG_L2_PACKET
-@@ -763,6 +768,12 @@ install: all
+@@ -775,6 +780,12 @@ install: all
  
  BCHECK=../src/drivers/build.hostapd
  
@@ -39,7 +39,7 @@
  hostapd: $(BCHECK) $(OBJS)
        $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
  
-@@ -801,6 +812,12 @@ HOBJS += ../src/crypto/aes-internal.o
+@@ -813,6 +824,12 @@ HOBJS += ../src/crypto/aes-internal.o
  HOBJS += ../src/crypto/aes-internal-enc.o
  endif
  
@@ -54,15 +54,15 @@
  
 --- a/wpa_supplicant/Makefile
 +++ b/wpa_supplicant/Makefile
-@@ -52,6 +52,7 @@ OBJS_p += ../src/utils/wpabuf.o
- OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
+@@ -53,6 +53,7 @@ OBJS_c = wpa_cli.o ../src/common/wpa_ctr
+ OBJS_c += ../src/utils/wpa_debug.o
  
  -include .config
 +-include $(if $(MULTICALL),../hostapd/.config)
  
  ifndef CONFIG_OS
  ifdef CONFIG_NATIVE_WINDOWS
-@@ -622,6 +623,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -627,6 +628,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
  CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
  LIBS += -ldl -rdynamic
  endif
@@ -73,7 +73,19 @@
  endif
  
  ifdef CONFIG_AP
-@@ -676,6 +681,12 @@ CFLAGS += -DEAP_SERVER_WSC
+@@ -635,9 +640,11 @@ NEED_EAP_COMMON=y
+ NEED_RSN_AUTHENTICATOR=y
+ CFLAGS += -DCONFIG_AP
+ OBJS += ap.o
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
+ CFLAGS += -DCONFIG_NO_ACCOUNTING
+ CFLAGS += -DCONFIG_NO_VLAN
++endif
+ OBJS += ../src/ap/hostapd.o
+ OBJS += ../src/ap/wpa_auth_glue.o
+ OBJS += ../src/ap/utils.o
+@@ -681,10 +688,18 @@ CFLAGS += -DEAP_SERVER_WSC
  OBJS += ../src/ap/wps_hostapd.o
  OBJS += ../src/eap_server/eap_server_wsc.o
  endif
@@ -86,7 +98,13 @@
  endif
  
  ifdef NEED_RSN_AUTHENTICATOR
-@@ -1317,6 +1328,12 @@ BCHECK=../src/drivers/build.wpa_supplica
++ifndef MULTICALL
+ CFLAGS += -DCONFIG_NO_RADIUS
++endif
+ NEED_AES_WRAP=y
+ OBJS += ../src/ap/wpa_auth.o
+ OBJS += ../src/ap/wpa_auth_ie.o
+@@ -1334,6 +1349,12 @@ BCHECK=../src/drivers/build.wpa_supplica
  wpa_priv: $(BCHECK) $(OBJS_priv)
        $(LDO) $(LDFLAGS) -o wpa_priv $(OBJS_priv) $(LIBS)
  
@@ -99,7 +117,7 @@
  wpa_supplicant: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
        $(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
  
-@@ -1376,6 +1393,12 @@ endif
+@@ -1393,6 +1414,12 @@ endif
        $(Q)$(CC) -c -o $@ $(CFLAGS) $<
        @$(E) "  CC " $<
  
@@ -114,7 +132,7 @@
  wpa_cli.exe: wpa_cli
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
-@@ -2684,8 +2684,8 @@ union wpa_event_data {
+@@ -3103,8 +3103,8 @@ union wpa_event_data {
   * Driver wrapper code should call this function whenever an event is received
   * from the driver.
   */
@@ -127,7 +145,7 @@
  /*
 --- a/src/ap/drv_callbacks.c
 +++ b/src/ap/drv_callbacks.c
-@@ -420,8 +420,8 @@ static void hostapd_event_eapol_rx(struc
+@@ -443,8 +443,8 @@ static void hostapd_event_eapol_rx(struc
  }
  
  
@@ -138,7 +156,7 @@
  {
        struct hostapd_data *hapd = ctx;
  
-@@ -498,5 +498,6 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -526,5 +526,6 @@ void wpa_supplicant_event(void *ctx, enu
                break;
        }
  }
@@ -169,8 +187,8 @@
        for (;;) {
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -1556,8 +1556,8 @@ static void ft_rx_action(struct wpa_supp
- #endif /* CONFIG_IEEE80211R */
+@@ -1679,8 +1679,8 @@ static void wpa_supplicant_event_unprot_
+ }
  
  
 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
@@ -182,7 +200,7 @@
        u16 reason_code = 0;
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2320,6 +2320,9 @@ struct wpa_supplicant * wpa_supplicant_g
+@@ -2332,6 +2332,9 @@ struct wpa_supplicant * wpa_supplicant_g
        return NULL;
  }
  
@@ -192,7 +210,7 @@
  
  /**
   * wpa_supplicant_init - Initialize %wpa_supplicant
-@@ -2338,6 +2341,7 @@ struct wpa_global * wpa_supplicant_init(
+@@ -2350,6 +2353,7 @@ struct wpa_global * wpa_supplicant_init(
        if (params == NULL)
                return NULL;