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=ham 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 D48C5C4332D for ; Wed, 18 Mar 2020 21:00:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9938620777 for ; Wed, 18 Mar 2020 21:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565254; bh=zQXaz5RDG5zZ9BxRu11qDDNdjxUHAfWHlvQG92LbasQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RtF21L4KnAMCuZmPIPQyhxdqR8iJG4r9dqEq/49X+FMGBVDHcYD9VLlotXow5bvVs fzJBZINZvHIJIzEWo+v0NJKmnpj1NiPYk0oCSxNUSXGQ1qcpzD0l+1wTL11DprbB6G yZxJLDfqv6DkqJknnxLerP9zkXk+R/VT0WqjcuR0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728840AbgCRVAx (ORCPT ); Wed, 18 Mar 2020 17:00:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:57272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728595AbgCRU4Y (ORCPT ); Wed, 18 Mar 2020 16:56:24 -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 0381020BED; Wed, 18 Mar 2020 20:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564983; bh=zQXaz5RDG5zZ9BxRu11qDDNdjxUHAfWHlvQG92LbasQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uhuzYBqZhlsznGsPeeUZVqTOePpg4NjjgfplKFgFD/xfUxZ5Giv8UPB0IUPiOlixO ivo0YO6cja0aUhSLqypF1t7hFpuvs2/b2JRsjxs6SuRY6Ao/RVwlwgk+o1doUCqdLR 3rjpm8xMlHWaB1GPkPi5AGnUrabcvkNHCy/5B/zY= 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.14 24/28] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled Date: Wed, 18 Mar 2020 16:55:51 -0400 Message-Id: <20200318205555.17447-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205555.17447-1-sashal@kernel.org> References: <20200318205555.17447-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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