Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled
To:     Nicolas Cavallari <cavallar@lri.fr>, linux-wireless@vger.kernel.org
Cc:     Johannes Berg <johannes@sipsolutions.com>
References: <20200305140409.12204-1-cavallar@lri.fr>
From:   Thomas Pedersen <thomas@adapt-ip.com>
Message-ID: <0deb25c7-4880-a29b-6a38-396e1d235180@adapt-ip.com>
Date:   Thu, 5 Mar 2020 12:07:29 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.8.0
MIME-Version: 1.0
In-Reply-To: <20200305140409.12204-1-cavallar@lri.fr>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

On 3/5/20 6:04 AM, Nicolas Cavallari wrote:
> From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
> 
> 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 <nicolas.cavallari@green-communications.fr>
> ---
>  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 d69983370381..38a0383dfbcf 100644
> --- a/net/mac80211/mesh_hwmp.c
> +++ b/net/mac80211/mesh_hwmp.c
> @@ -1152,7 +1152,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)
> 

The skb would still get queued onto the mpath->frame_queue. Is it
this expected? ie. do you have a non-hwmp path selection algorithm which
will handle it, or are you really checking if path selection is
disabled?

-- 
-- thomas