aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-25 14:31:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-10-25 14:31:17 +0000
commitf911fb32feca42396c09ebf0042b99e207cd7c48 (patch)
treebf317ecf4a6deafca443e478fee8f01ce294b994 /package/network/services
parentdea2da55df30441adb22501d9a596d5c6b67228b (diff)
downloadupstream-f911fb32feca42396c09ebf0042b99e207cd7c48.tar.gz
upstream-f911fb32feca42396c09ebf0042b99e207cd7c48.tar.bz2
upstream-f911fb32feca42396c09ebf0042b99e207cd7c48.zip
hostapd: merge some pending fixes (fixes assoc errors when moving between vaps of the same wifi device)
SVN-Revision: 33919
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/hostapd/patches/100-pending_work.patch42
-rw-r--r--package/network/services/hostapd/patches/410-multicall.patch2
2 files changed, 43 insertions, 1 deletions
diff --git a/package/network/services/hostapd/patches/100-pending_work.patch b/package/network/services/hostapd/patches/100-pending_work.patch
index 1c97a64caa..73949dd386 100644
--- a/package/network/services/hostapd/patches/100-pending_work.patch
+++ b/package/network/services/hostapd/patches/100-pending_work.patch
@@ -121,3 +121,45 @@
if (bss != &drv->first_bss) {
struct i802_bss *tbss;
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -672,12 +672,15 @@ static void hostapd_event_eapol_rx(struc
+ const u8 *data, size_t data_len)
+ {
+ struct hostapd_iface *iface = hapd->iface;
++ struct sta_info *sta;
+ size_t j;
+
+ for (j = 0; j < iface->num_bss; j++) {
+- if (ap_get_sta(iface->bss[j], src)) {
+- hapd = iface->bss[j];
+- break;
++ if ((sta = ap_get_sta(iface->bss[j], src))) {
++ if (sta->flags & WLAN_STA_ASSOC) {
++ hapd = iface->bss[j];
++ break;
++ }
+ }
+ }
+
+--- a/src/eap_peer/eap.c
++++ b/src/eap_peer/eap.c
+@@ -348,6 +348,7 @@ SM_STATE(EAP, METHOD)
+ {
+ struct wpabuf *eapReqData;
+ struct eap_method_ret ret;
++ int min_len = 1;
+
+ SM_ENTRY(EAP, METHOD);
+ if (sm->m == NULL) {
+@@ -356,7 +357,9 @@ SM_STATE(EAP, METHOD)
+ }
+
+ eapReqData = eapol_get_eapReqData(sm);
+- if (!eap_hdr_len_valid(eapReqData, 1))
++ if (sm->m->vendor == EAP_VENDOR_IETF && sm->m->method == EAP_TYPE_LEAP)
++ min_len = 0; /* LEAP uses EAP-Success without payload */
++ if (!eap_hdr_len_valid(eapReqData, min_len))
+ return;
+
+ /*
diff --git a/package/network/services/hostapd/patches/410-multicall.patch b/package/network/services/hostapd/patches/410-multicall.patch
index 7900428aea..a774603b40 100644
--- a/package/network/services/hostapd/patches/410-multicall.patch
+++ b/package/network/services/hostapd/patches/410-multicall.patch
@@ -145,7 +145,7 @@
/*
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
-@@ -685,8 +685,8 @@ static void hostapd_event_eapol_rx(struc
+@@ -688,8 +688,8 @@ static void hostapd_event_eapol_rx(struc
}