Message ID | 20200630121907.132751-11-markus.theil@tu-ilmenau.de |
---|---|
State | Accepted |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tu-ilmenau.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=GHzaAzBb; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x3N72hcmz9sTK for <incoming@patchwork.ozlabs.org>; Tue, 30 Jun 2020 22:20:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4L7/RhgGyNalzX5n5DAWeB+0p6DXXKIelkrG/YBqg2c=; b=GHzaAzBbdSv1TQShCWMEWUVlQ 4v2Rfc8w3MlWk0obAuOGXQ22Cdeeqa5o2i5Ce1jh+vNBctpvhlwe/XECC8G9w0VqRhwioarMte+zL g6Sq1EUlJXoTlwaTMGAkQdmJDfvIHCKSgHl5LoIRp0HGoCmJtRZUT2UBKlLYkqsrYmA3Ml710bOZA 6b7KcK6cQ0EgJ4S2XD8WTHh9oQOlkPprozXID/Dp5Q5JMiai66odvuyinBwJNxPbNj0dzgDGB/No6 t05L/IeSorpbkhxrDJ8VmDATlweZrmnYK6fNRP8YXDAnrZGMcPI/WhB6c9etgzYLAHPqaCg9+aK/g 075bxd9HQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqFEe-00031x-Vc; Tue, 30 Jun 2020 12:19:37 +0000 Received: from smail.rz.tu-ilmenau.de ([141.24.186.67]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqFEU-0002z2-Dz for hostap@lists.infradead.org; Tue, 30 Jun 2020 12:19:28 +0000 Received: from legolas.prakinf.tu-ilmenau.de (unknown [141.24.207.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smail.rz.tu-ilmenau.de (Postfix) with ESMTPSA id 885FB58008B; Tue, 30 Jun 2020 14:19:21 +0200 (CEST) From: Markus Theil <markus.theil@tu-ilmenau.de> To: hostap@lists.infradead.org Subject: [PATCH v2 10/12] mesh: fix mesh_oom test Date: Tue, 30 Jun 2020 14:19:05 +0200 Message-Id: <20200630121907.132751-11-markus.theil@tu-ilmenau.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200630121907.132751-1-markus.theil@tu-ilmenau.de> References: <20200630121907.132751-1-markus.theil@tu-ilmenau.de> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [141.24.186.67 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: masashi.honma@gmail.com, Markus Theil <markus.theil@tu-ilmenau.de> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mesh: support for DFS
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 0742cabbc..383ec1c7b 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -218,7 +218,7 @@ static int wpas_mesh_complete(struct wpa_supplicant *wpa_s) * inspect if channel's been changed since initialized. * i.e. DFS radar detection */ - if (ifmsh->freq != params->freq.freq) { + if (ifmsh->freq > 0 && ifmsh->freq != params->freq.freq) { wpa_s->assoc_freq = ifmsh->freq; ssid->frequency = ifmsh->freq; struct he_capabilities *he_capab = NULL;
Only change freq params, if ifmsh->freq is set initially, which only happens if hostapd_get_hw_features in setup_interface2 succeeds. Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de> --- wpa_supplicant/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)