projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: update to 2012-09-10
[openwrt/svn-archive/archive.git]
/
package
/
hostapd
/
patches
/
410-multicall.patch
diff --git
a/package/hostapd/patches/410-multicall.patch
b/package/hostapd/patches/410-multicall.patch
index b653769329752ed746a91bf953ce9dbe24fe38af..7900428aea9b311a88257b996b0e32cecb54555a 100644
(file)
--- a/
package/hostapd/patches/410-multicall.patch
+++ b/
package/hostapd/patches/410-multicall.patch
@@
-8,8
+8,8
@@
ifndef CONFIG_OS
ifdef CONFIG_NATIVE_WINDOWS
ifndef CONFIG_OS
ifdef CONFIG_NATIVE_WINDOWS
-@@ -1
68,10 +169,14 @@ ifdef CONFIG_IEEE80211N
- CFLAGS += -DCONFIG_IEEE80211
N
+@@ -1
88,10 +189,14 @@ ifdef CONFIG_IEEE80211AC
+ CFLAGS += -DCONFIG_IEEE80211
AC
endif
+ifndef MULTICALL
endif
+ifndef MULTICALL
@@
-26,7
+26,7
@@
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
LIBS += $(DRV_AP_LIBS)
ifdef CONFIG_L2_PACKET
-@@ -8
15,6 +820
,12 @@ install: all
+@@ -8
67,6 +872
,12 @@ install: all
BCHECK=../src/drivers/build.hostapd
BCHECK=../src/drivers/build.hostapd
@@
-39,7
+39,7
@@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
hostapd: $(BCHECK) $(OBJS)
$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
@$(E) " LD " $@
-@@ -
853,6 +864
,12 @@ HOBJS += ../src/crypto/aes-internal.o
+@@ -
905,6 +916
,12 @@ HOBJS += ../src/crypto/aes-internal.o
HOBJS += ../src/crypto/aes-internal-enc.o
endif
HOBJS += ../src/crypto/aes-internal-enc.o
endif
@@
-62,7
+62,7
@@
BINALL=wpa_supplicant wpa_cli
BINALL=wpa_supplicant wpa_cli
-@@ -
673,6 +674
,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
+@@ -
705,6 +706
,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
LIBS += -ldl -rdynamic
endif
@@
-73,7
+73,7
@@
endif
ifdef CONFIG_AP
endif
ifdef CONFIG_AP
-@@ -
681,9 +686
,11 @@ NEED_EAP_COMMON=y
+@@ -
713,9 +718
,11 @@ NEED_EAP_COMMON=y
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
NEED_RSN_AUTHENTICATOR=y
CFLAGS += -DCONFIG_AP
OBJS += ap.o
@@
-85,9
+85,9
@@
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
-@@ -7
31,10 +738
,18 @@ endif
- ifdef CONFIG_
INTERWORKING
- OBJS += ../src/ap/
gas_serv
.o
+@@ -7
70,10 +777
,18 @@ endif
+ ifdef CONFIG_
HS20
+ OBJS += ../src/ap/
hs20
.o
endif
+else
+ ifdef MULTICALL
endif
+else
+ ifdef MULTICALL
@@
-104,7
+104,7
@@
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
NEED_AES_WRAP=y
OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-@@ -1
419,6 +1434
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
+@@ -1
515,6 +1530
,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
$(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
$(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 " $@
wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
$(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
@$(E) " LD " $@
-@@ -1
485,6 +15
06,12 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.
+@@ -1
585,6 +16
06,12 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.
%@.service: %.service.arg.in
sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
%@.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
wpa_cli.exe: wpa_cli
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -3
572,8 +3572
,8 @@ union wpa_event_data {
+@@ -3
686,8 +3686
,8 @@ union wpa_event_data {
* Driver wrapper code should call this function whenever an event is received
* from the driver.
*/
* 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
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -
467,8 +467
,8 @@ static void hostapd_event_eapol_rx(struc
+@@ -
685,8 +685
,8 @@ static void hostapd_event_eapol_rx(struc
}
}
@@
-179,7
+179,7
@@
for (;;) {
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
for (;;) {
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
-@@ -2
046,8 +2046
,8 @@ static void wnm_action_rx(struct wpa_sup
+@@ -2
258,8 +2258
,8 @@ static void wnm_action_rx(struct wpa_sup
}
}
@@
-192,7
+192,7
@@
u16 reason_code = 0;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
u16 reason_code = 0;
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2
704,6 +2704
,9 @@ static void wpa_supplicant_deinit_iface(
+@@ -2
921,6 +2921
,9 @@ static void wpa_supplicant_deinit_iface(
}
}
}
}
@@
-202,7
+202,7
@@
/**
* wpa_supplicant_add_iface - Add a new network interface
/**
* wpa_supplicant_add_iface - Add a new network interface
-@@ -
2895,6 +2898
,7 @@ struct wpa_global * wpa_supplicant_init(
+@@ -
3113,6 +3116
,7 @@ struct wpa_global * wpa_supplicant_init(
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
#endif /* CONFIG_NO_WPA_MSG */
@@
-212,8
+212,8
@@
wpa_debug_open_syslog();
--- a/hostapd/main.c
+++ b/hostapd/main.c
wpa_debug_open_syslog();
--- a/hostapd/main.c
+++ b/hostapd/main.c
-@@ -53
3,6 +533,9 @@ static const char * hostapd_msg_ifname_c
- return
NULL
;
+@@ -53
0,6 +530,9 @@ static int hostapd_get_global_ctrl_iface
+ return
0
;
}
+void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
}
+void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
@@
-222,13
+222,13
@@
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
-@@ -5
46,6 +549
,7 @@ int main(int argc, char *argv[])
- i
f (os_program_init())
-
return
-1;
+@@ -5
55,6 +558
,7 @@ int main(int argc, char *argv[])
+ i
nterfaces.global_iface_name = NULL;
+
interfaces.global_ctrl_sock =
-1;
+ wpa_supplicant_event = hostapd_wpa_event;
for (;;) {
+ wpa_supplicant_event = hostapd_wpa_event;
for (;;) {
- c = getopt(argc, argv, "Bde:f:hKP:tv");
+ c = getopt(argc, argv, "Bde:f:hKP:tv
g:
");
if (c < 0)
--- a/src/drivers/drivers.c
+++ b/src/drivers/drivers.c
if (c < 0)
--- a/src/drivers/drivers.c
+++ b/src/drivers/drivers.c