On 3/5/20 6:04 AM, Nicolas Cavallari wrote: > From: Nicolas Cavallari <nicolas.cavallari@xxxxxxxxxxxxxxxxxxxxxxx> > > 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@xxxxxxxxxxxxxxxxxxxxxxx> > --- > 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
