mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
167028b750
The size of the ipkgs increase a bit (between 0.7% and 1.1%): old 2019-04-21 (2.8): 288264 wpad-basic_2019-04-21-63962824-1_mipsel_24kc.ipk 256188 wpad-mini_2019-04-21-63962824-1_mipsel_24kc.ipk 427475 wpad-openssl_2019-04-21-63962824-1_mipsel_24kc.ipk 423071 wpad-wolfssl_2019-04-21-63962824-1_mipsel_24kc.ipk new 2019-08-08 (2.9): 290217 wpad-basic_2019-08-08-ca8c2bd2-1_mipsel_24kc.ipk 258745 wpad-mini_2019-08-08-ca8c2bd2-1_mipsel_24kc.ipk 431732 wpad-openssl_2019-08-08-ca8c2bd2-1_mipsel_24kc.ipk 427641 wpad-wolfssl_2019-08-08-ca8c2bd2-1_mipsel_24kc.ipk Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
938 B
Diff
35 lines
938 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Tue, 12 Feb 2019 14:22:43 +0100
|
|
Subject: [PATCH v2] wpa_supplicant: fix race condition in mesh mpm new peer
|
|
handling
|
|
|
|
When wpa_supplicant receives another new peer event before the first one
|
|
has been processed, it tries to add a station to the driver a second time
|
|
(which fails) and then tears down the station entry until another event
|
|
comes in.
|
|
Fix this by only adding a station to the driver if it didn't exist already.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/wpa_supplicant/mesh_mpm.c
|
|
+++ b/wpa_supplicant/mesh_mpm.c
|
|
@@ -710,11 +710,12 @@ static struct sta_info * mesh_mpm_add_pe
|
|
}
|
|
|
|
sta = ap_get_sta(data, addr);
|
|
- if (!sta) {
|
|
- sta = ap_sta_add(data, addr);
|
|
- if (!sta)
|
|
- return NULL;
|
|
- }
|
|
+ if (sta)
|
|
+ return NULL;
|
|
+
|
|
+ sta = ap_sta_add(data, addr);
|
|
+ if (!sta)
|
|
+ return NULL;
|
|
|
|
/* Set WMM by default since Mesh STAs are QoS STAs */
|
|
sta->flags |= WLAN_STA_WMM;
|