From ad35c2c69e946c8197d5125869e9e77730726b4e Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 24 Apr 2010 17:24:07 +0000
Subject: hostapd: update to 20100418 (0.7.2)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21142 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/hostapd/patches/200-multicall.patch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'package/hostapd/patches/200-multicall.patch')

diff --git a/package/hostapd/patches/200-multicall.patch b/package/hostapd/patches/200-multicall.patch
index 4ba9301a3..006e26a94 100644
--- a/package/hostapd/patches/200-multicall.patch
+++ b/package/hostapd/patches/200-multicall.patch
@@ -26,7 +26,7 @@
  LIBS += $(DRV_AP_LIBS)
  
  ifdef CONFIG_L2_PACKET
-@@ -738,6 +743,12 @@ install: all
+@@ -739,6 +744,12 @@ install: all
  
  BCHECK=../src/drivers/build.hostapd
  
@@ -39,7 +39,7 @@
  hostapd: $(BCHECK) $(OBJS)
  	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
  
-@@ -776,6 +787,12 @@ HOBJS += ../src/crypto/aes-internal.o
+@@ -777,6 +788,12 @@ HOBJS += ../src/crypto/aes-internal.o
  HOBJS += ../src/crypto/aes-internal-enc.o
  endif
  
@@ -86,7 +86,7 @@
  endif
  
  ifdef NEED_RSN_AUTHENTICATOR
-@@ -1261,6 +1272,12 @@ BCHECK=../src/drivers/build.wpa_supplica
+@@ -1262,6 +1273,12 @@ BCHECK=../src/drivers/build.wpa_supplica
  wpa_priv: $(BCHECK) $(OBJS_priv)
  	$(LDO) $(LDFLAGS) -o wpa_priv $(OBJS_priv) $(LIBS)
  
@@ -99,7 +99,7 @@
  wpa_supplicant: .config $(BCHECK) $(OBJS) $(EXTRA_progs)
  	$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
  
-@@ -1320,6 +1337,12 @@ endif
+@@ -1321,6 +1338,12 @@ endif
  	$(Q)$(CC) -c -o $@ $(CFLAGS) $<
  	@$(E) "  CC " $<
  
@@ -114,7 +114,7 @@
  wpa_cli.exe: wpa_cli
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
-@@ -2413,8 +2413,8 @@ union wpa_event_data {
+@@ -2449,8 +2449,8 @@ union wpa_event_data {
   * Driver wrapper code should call this function whenever an event is received
   * from the driver.
   */
@@ -127,7 +127,7 @@
  /*
 --- a/src/ap/drv_callbacks.c
 +++ b/src/ap/drv_callbacks.c
-@@ -337,8 +337,8 @@ static void hostapd_event_eapol_rx(struc
+@@ -375,8 +375,8 @@ static void hostapd_event_eapol_rx(struc
  }
  
  
@@ -138,7 +138,7 @@
  {
  	struct hostapd_data *hapd = ctx;
  
-@@ -415,5 +415,6 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -453,5 +453,6 @@ void wpa_supplicant_event(void *ctx, enu
  		break;
  	}
  }
@@ -169,8 +169,8 @@
  	for (;;) {
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -1506,8 +1506,8 @@ static void wpa_supplicant_event_ibss_rs
- #endif /* CONFIG_IBSS_RSN */
+@@ -1577,8 +1577,8 @@ static void ft_rx_action(struct wpa_supp
+ #endif /* CONFIG_IEEE80211R */
  
  
 -void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
@@ -179,10 +179,10 @@
 +		      union wpa_event_data *data)
  {
  	struct wpa_supplicant *wpa_s = ctx;
- 
+ 	u16 reason_code = 0;
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2215,6 +2215,9 @@ struct wpa_supplicant * wpa_supplicant_g
+@@ -2223,6 +2223,9 @@ struct wpa_supplicant * wpa_supplicant_g
  	return NULL;
  }
  
@@ -192,7 +192,7 @@
  
  /**
   * wpa_supplicant_init - Initialize %wpa_supplicant
-@@ -2233,6 +2236,7 @@ struct wpa_global * wpa_supplicant_init(
+@@ -2241,6 +2244,7 @@ struct wpa_global * wpa_supplicant_init(
  	if (params == NULL)
  		return NULL;
  
@@ -202,7 +202,7 @@
  		wpa_debug_open_syslog();
 --- a/hostapd/main.c
 +++ b/hostapd/main.c
-@@ -478,6 +478,9 @@ static void usage(void)
+@@ -479,6 +479,9 @@ static void usage(void)
  	exit(1);
  }
  
@@ -212,7 +212,7 @@
  
  int main(int argc, char *argv[])
  {
-@@ -489,6 +492,7 @@ int main(int argc, char *argv[])
+@@ -490,6 +493,7 @@ int main(int argc, char *argv[])
  	if (os_program_init())
  		return -1;
  
-- 
cgit v1.2.3