Increase hopcount and convert metric to LE before forwarding the RANN
action frame.
Signed-off-by: Rui Paulo <rpaulo@xxxxxxxxx>
Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Reviewed-by: Andrey Yurovsky <andrey@xxxxxxxxxxx>
Tested-by: Brian Cavagnolo <brian@xxxxxxxxxxx>
---
net/mac80211/mesh_hwmp.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 1499bfd..1780c97 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -692,6 +692,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
orig_addr = RANN_IE_ORIG_ADDR(rann_elem);
orig_dsn = RANN_IE_ORIG_DSN(rann_elem);
hopcount = RANN_IE_HOPCOUNT(rann_elem);
+ hopcount++;
metric = RANN_IE_METRIC(rann_elem);
mhwmp_dbg("received RANN from %pM\n", orig_addr);
@@ -712,7 +713,8 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
mesh_path_sel_frame_tx(MPATH_RANN, flags, orig_addr,
cpu_to_le32(orig_dsn),
0, NULL, 0, sdata->dev->broadcast,
- hopcount, ttl, 0, cpu_to_le32(metric),
+ hopcount, ttl, 0,
+ cpu_to_le32(metric + mpath->metric),
0, sdata);
mpath->dsn = orig_dsn;
}
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
