mac80211: mesh - always do every discovery retry
PATCH 1/1 mac80211: mesh - always do every discovery retry
From: Jesse Jones <[email protected]>
Instead of stopping path discovery when a path is found continue attempting to find paths until we hit the dot11MeshHWMPmaxPREQretries limit.
This is important because path messages are not reliable and it is relatively common to have a short bad path to the destination along with a longer but better path. With the original code rather often a path message along the long path would be lost so we would stick with the bad path. With this change we have a greater chance to get messages over the longer path allowing us to select the long path if it's better.
The standard doesn't seem to address this issue. All it says (13.10.8.5) is that discovery should be limited to dot11MeshHWMPmaxPREQretries.
---
net/mac80211/mesh_hwmp.c +9 -5
@@ -1179,16 +1179,20 @@ void mesh_path_timer(unsigned long data)return ;spin_lock_bh (&mpath->state_lock); -if (mpath->flags &MESH_PATH_RESOLVED || - (!(mpath->flags &MESH_PATH_RESOLVING ))) { - mpath->flags &= ~(MESH_PATH_RESOLVING |MESH_PATH_RESOLVED ); -spin_unlock_bh (&mpath->state_lock); - }else if (mpath->discovery_retries <max_preq_retries (sdata)) { + +if (mpath->discovery_retries <max_preq_retries (sdata)) { ++mpath->discovery_retries; mpath->discovery_timeout *=2 ; mpath->flags &= ~MESH_PATH_REQ_QUEUED ;spin_unlock_bh (&mpath->state_lock);mesh_queue_preq (mpath,0 ); + + }else if ( + mpath->flags &MESH_PATH_RESOLVED || + (!(mpath->flags &MESH_PATH_RESOLVING ))) { + mpath->flags &= ~(MESH_PATH_RESOLVING |MESH_PATH_RESOLVED ); +spin_unlock_bh (&mpath->state_lock); + }else { mpath->flags &= ~(MESH_PATH_RESOLVING | MESH_PATH_RESOLVED |