From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEDBFC4332D for ; Wed, 18 Mar 2020 21:02:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8032120409 for ; Wed, 18 Mar 2020 21:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565369; bh=e3SKlr5O2es2C5zQ7d8FF39XYpnHto5JywuVVfDrEBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lKEIRQUt7+6ppBovxSa8vbNQNsH5CxNDzewRuwC2Vw9Jivu+gPmznFlffLL6Dj6AV 28KRgQA8EyHyOaJqemmMX33M6eHyyqUT80LVpLc7Q5eVhyXUe2Pk7jAJMA/G9lIOt5 Dpky15plg46Q1YGcgg0GbZ+OY30R2r1S9vayzuXI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728940AbgCRVCq (ORCPT ); Wed, 18 Mar 2020 17:02:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:56314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728459AbgCRUzs (ORCPT ); Wed, 18 Mar 2020 16:55:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 15196208E4; Wed, 18 Mar 2020 20:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564947; bh=e3SKlr5O2es2C5zQ7d8FF39XYpnHto5JywuVVfDrEBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZXb5Z2IW+jihLyECpUd4SKerRFCgdCu9rrjp8reL7CjofqAVe1PITprC2GPjjApYL RF7OVmUjODlyfB/NSnlUOhuVnA0IRu8jIVg+ydka2VFXJb/82njCbpI/5P24N+JPfa mnQQN7LTML+9XWqktmLiYkU8qcMOBLx7sxQUumIY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Cavallari , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 32/37] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled Date: Wed, 18 Mar 2020 16:55:04 -0400 Message-Id: <20200318205509.17053-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205509.17053-1-sashal@kernel.org> References: <20200318205509.17053-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 740dc9fa127cd..433d136282ded 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