diff options
| author | Nicolas Cavallari <nicolas.cavallari@green-communications.fr> | 2020-03-05 15:04:09 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-03-11 09:04:14 +0100 |
| commit | ba32679cac50c38fdf488296f96b1f3175532b8e (patch) | |
| tree | 8730ccaaccfa7ab6cbd865a008fa17cf894fb981 /net | |
| parent | nl80211: add missing attribute validation for channel switch (diff) | |
| download | linux-ba32679cac50c38fdf488296f96b1f3175532b8e.tar.xz linux-ba32679cac50c38fdf488296f96b1f3175532b8e.zip | |
mac80211: Do not send mesh HWMP PREQ if HWMP is disabled
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>
Link: https://lore.kernel.org/r/20200305140409.12204-1-cavallar@lri.fr
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |