hostapd: update to 2014-10-25

[openwrt.git] / package / network / services / hostapd / patches / 200-multicall.patch

diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch
index efe151c..23180b9 100644 (file)
--- a/package/network/services/hostapd/patches/200-multicall.patch
+++ b/package/network/services/hostapd/patches/200-multicall.patch
@@ -8,7 +8,7 @@
  
  ifdef CONFIG_TESTING_OPTIONS
  CFLAGS += -DCONFIG_TESTING_OPTIONS
-@@ -223,10 +224,14 @@ ifdef CONFIG_IEEE80211AC
+@@ -224,10 +225,14 @@ ifdef CONFIG_IEEE80211AC
  CFLAGS += -DCONFIG_IEEE80211AC
  endif
  
@@ -26,7 +26,7 @@
  LIBS += $(DRV_AP_LIBS)
  
  ifdef CONFIG_L2_PACKET
-@@ -913,6 +918,12 @@ install: all
+@@ -914,6 +919,12 @@ install: all
  
  BCHECK=../src/drivers/build.hostapd
  
@@ -39,7 +39,7 @@
  hostapd: $(BCHECK) $(OBJS)
        $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
        @$(E) "  LD " $@
-@@ -951,6 +962,12 @@ HOBJS += ../src/crypto/aes-internal.o
+@@ -952,6 +963,12 @@ HOBJS += ../src/crypto/aes-internal.o
  HOBJS += ../src/crypto/aes-internal-enc.o
  endif
  
@@ -62,7 +62,7 @@
  
  ifdef CONFIG_TESTING_OPTIONS
  CFLAGS += -DCONFIG_TESTING_OPTIONS
-@@ -741,6 +742,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -745,6 +746,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
  CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
  LIBS += -ldl -rdynamic
  endif
@@ -73,7 +73,7 @@
  endif
  
  ifdef CONFIG_MACSEC
-@@ -762,9 +767,11 @@ NEED_EAP_COMMON=y
+@@ -765,9 +770,11 @@ NEED_EAP_COMMON=y
  NEED_RSN_AUTHENTICATOR=y
  CFLAGS += -DCONFIG_AP
  OBJS += ap.o
@@ -85,7 +85,7 @@
  OBJS += ../src/ap/hostapd.o
  OBJS += ../src/ap/wpa_auth_glue.o
  OBJS += ../src/ap/utils.o
-@@ -826,10 +833,18 @@ endif
+@@ -830,10 +837,18 @@ endif
  ifdef CONFIG_HS20
  OBJS += ../src/ap/hs20.o
  endif
@@ -104,7 +104,7 @@
  NEED_AES_WRAP=y
  OBJS += ../src/ap/wpa_auth.o
  OBJS += ../src/ap/wpa_auth_ie.o
-@@ -1602,6 +1617,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -1589,6 +1604,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
  
  $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
  
@@ -117,7 +117,7 @@
  wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
        $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
        @$(E) "  LD " $@
-@@ -1682,6 +1703,12 @@ endif
+@@ -1669,6 +1690,12 @@ endif
  %@.service: %.service.arg.in
        sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
  
@@ -132,7 +132,7 @@
  wpa_cli.exe: wpa_cli
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
-@@ -4117,8 +4117,8 @@ union wpa_event_data {
+@@ -4294,8 +4294,8 @@ union wpa_event_data {
   * Driver wrapper code should call this function whenever an event is received
   * from the driver.
   */
@@ -145,7 +145,7 @@
  /*
 --- a/src/ap/drv_callbacks.c
 +++ b/src/ap/drv_callbacks.c
-@@ -926,8 +926,8 @@ static void hostapd_event_dfs_nop_finish
+@@ -989,8 +989,8 @@ static void hostapd_event_dfs_nop_finish
  #endif /* NEED_AP_MLME */
  
  
@@ -179,7 +179,7 @@
        for (;;) {
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -2919,8 +2919,8 @@ static void wpa_supplicant_notify_avoid_
+@@ -2924,8 +2924,8 @@ static void wpa_supplicant_event_assoc_a
  }
  
  
@@ -192,7 +192,7 @@
  
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -3811,6 +3811,9 @@ static void wpa_supplicant_deinit_iface(
+@@ -3980,6 +3980,9 @@ static void wpa_supplicant_deinit_iface(
        os_free(wpa_s);
  }
  
@@ -202,7 +202,7 @@
  
  /**
   * wpa_supplicant_add_iface - Add a new network interface
-@@ -4002,6 +4005,7 @@ struct wpa_global * wpa_supplicant_init(
+@@ -4181,6 +4184,7 @@ struct wpa_global * wpa_supplicant_init(
        wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
  #endif /* CONFIG_NO_WPA_MSG */
  
@@ -212,7 +212,7 @@
                wpa_debug_open_syslog();
 --- a/hostapd/main.c
 +++ b/hostapd/main.c
-@@ -502,6 +502,9 @@ static int hostapd_get_ctrl_iface_group(
+@@ -504,6 +504,9 @@ static int hostapd_get_ctrl_iface_group(
        return 0;
  }
  
@@ -222,7 +222,7 @@
  
  #ifdef CONFIG_WPS
  static int gen_uuid(const char *txt_addr)
-@@ -553,6 +556,7 @@ int main(int argc, char *argv[])
+@@ -555,6 +558,7 @@ int main(int argc, char *argv[])
        interfaces.global_iface_name = NULL;
        interfaces.global_ctrl_sock = -1;
  
@@ -257,7 +257,7 @@
  struct wpa_driver_ops *wpa_drivers[] = { NULL };
  
  
-@@ -1185,6 +1189,8 @@ static void usage(void)
+@@ -1194,6 +1198,8 @@ static void usage(void)
               "option several times.\n");
  }
  
@@ -266,7 +266,7 @@
  
  int main(int argc, char *argv[])
  {
-@@ -1203,6 +1209,7 @@ int main(int argc, char *argv[])
+@@ -1212,6 +1218,7 @@ int main(int argc, char *argv[])
        if (os_program_init())
                return -1;