Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes, nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user