lkml.org 
[lkml]   [2020]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 12/15] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled
    Date
    From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>

    [ 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 <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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 5f4c228b82e56..f7eaa1051b5b2 100644
    --- a/net/mac80211/mesh_hwmp.c
    +++ b/net/mac80211/mesh_hwmp.c
    @@ -1131,7 +1131,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
    \
     
     \ /
      Last update: 2020-03-18 22:10    [W:2.808 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site