diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-25 14:31:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-25 14:31:17 +0000 |
| commit | 1e4b9a79ca1101e33c630e1d0b53611e01baba38 (patch) | |
| tree | c9b6dc7b53de507072c90eddec115059080a9275 | |
| parent | 0beb881c373d08054275929f47d936e3b893ca72 (diff) | |
| download | upstream-1e4b9a79ca1101e33c630e1d0b53611e01baba38.tar.gz upstream-1e4b9a79ca1101e33c630e1d0b53611e01baba38.tar.bz2 upstream-1e4b9a79ca1101e33c630e1d0b53611e01baba38.zip | |
hostapd: merge some pending fixes (fixes assoc errors when moving between vaps of the same wifi device)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33919 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/network/services/hostapd/patches/100-pending_work.patch | 42 | ||||
| -rw-r--r-- | package/network/services/hostapd/patches/410-multicall.patch | 2 |
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 } |