Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp848471pja; Wed, 1 Apr 2020 09:47:33 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvPZb6FB/YfF5jFaa4ajTtQs/kBJG/VqjTc62nTAXtTuK2xzT85AHHayfMY2YhdNHQwwqn1 X-Received: by 2002:a05:6830:22c3:: with SMTP id q3mr18355968otc.152.1585759653143; Wed, 01 Apr 2020 09:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585759653; cv=none; d=google.com; s=arc-20160816; b=zOgHXlQQk4zFwvZr86wlh9IRBMMl7NC4i6LWSxHBEMoKMIMSieiDhuJ4CggY/BbG/C dGFSuLKFU5RSuPSxo/IXUs+cN6DNLjxCMPGffa5WqGfVy662BPdR9SNU87G/ajF1KJK8 CVPsPZ5BQLbB0MBlSZ0JUAeXR4S/B2lLAZHPTYSdpnxpLA5biwk5Rni/YzSrisNcINUU UyHP1mjzNMRMLZerFB6g9ZVjguDjHFXkLgWyDhQgUpeKxAkHjS3pTaruYMr5Qr5t0Fpa Yk/9/iA4IVBkn6CNt9R59BLOdqCgSlP2Nhn/lBZaSAwDO6egoe53WGExgug0wtuSJdxD 9a2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ryL0KmqIJNXnQvyTCesM5MSQRnmuQLOn/TJ+CEc7kRY=; b=vM1KhzqrVulacw6J9dyFcOR+CH8v3KpRZFHU0QI+0iFjq6K2qD0HvBJ+Ck+cn7DQ60 WW9AeEF2yfdy934xKvDvfJZ+76Ia9I5KQxO/frPmCXDvMHlzfSKwcU0pK2ZOd62Q3Sad rnVmPqRrvU4mM7D3iYNHS58OjJh8b9pMyj1wxg8GXgEWf1nqaBThli6PF+4UqGunC7Ko IAjLxIaA439WK+UCK6w1uhiG1UvHTe1sW0q2M0UHUmYOI4Uoik2/+n8cJXJSojRrmt8F /35qxxrutBg1rBVBs+jU5Oki4c/7zjuP7/8z6e1YbTv+p5V/LLAT2wd6uaJ/fNRhieeG jNgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CRa4lr7f; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u136si1071676oif.197.2020.04.01.09.47.19; Wed, 01 Apr 2020 09:47:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CRa4lr7f; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389655AbgDAQqS (ORCPT + 99 others); Wed, 1 Apr 2020 12:46:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389665AbgDAQqP (ORCPT ); Wed, 1 Apr 2020 12:46:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B09120784; Wed, 1 Apr 2020 16:46:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585759574; bh=zQXaz5RDG5zZ9BxRu11qDDNdjxUHAfWHlvQG92LbasQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CRa4lr7fwD7S+DihRR++mrOg95Qa+1Zj621LAeIOIsy36NwDFMT+eiK0r+MoBf1T6 9DpVn0NQq4Z8yufWGln1RnNMZKfA6TV9H7hbtdceLTbDMrkfjnCwkmHwYk9tDcFsoI lb5HrJGYQXut/MNHRY0VH++oKkbaAuEs+tN8kYv4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Cavallari , Johannes Berg , Sasha Levin Subject: [PATCH 4.14 082/148] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled Date: Wed, 1 Apr 2020 18:17:54 +0200 Message-Id: <20200401161601.057702558@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161552.245876366@linuxfoundation.org> References: <20200401161552.245876366@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Cavallari [ Upstream commit ba32679cac50c38fdf488296f96b1f3175532b8e ] When trying to transmit to an unknown destination, the mesh code would unconditionally transmit a HWMP PREQ even if HWMP is not the current path selection algorithm. Signed-off-by: Nicolas Cavallari Link: https://lore.kernel.org/r/20200305140409.12204-1-cavallar@lri.fr Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mesh_hwmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 994dde6e5f9d9..986e9b6b961d2 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -1137,7 +1137,8 @@ int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata, } } - if (!(mpath->flags & MESH_PATH_RESOLVING)) + if (!(mpath->flags & MESH_PATH_RESOLVING) && + mesh_path_sel_is_hwmp(sdata)) mesh_queue_preq(mpath, PREQ_Q_F_START); if (skb_queue_len(&mpath->frame_queue) >= MESH_FRAME_QUEUE_LEN) -- 2.20.1