From 89f3c082e87021525342b7bda19108daa9530c6c Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Mon, 9 Nov 2009 23:46:51 +0000 Subject: [PATCH] --- yaml --- r: 171735 b: refs/heads/master c: a6a58b4f14106e61e5d78aac7995686ed0d5eab8 h: refs/heads/master i: 171733: 80781721f3ba3a5fa7afb6d5ba81022e8b99642e 171731: 97fbc72db8eef672777ff656c7f5489e5338c447 171727: b94c2913eb686f6341bb452c002fc2b5c29f920e v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d855824fd06f..88bf9711f130 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d611f062f4351d8609910648854908fecf58970d +refs/heads/master: a6a58b4f14106e61e5d78aac7995686ed0d5eab8 diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index eb4180bff575..7d36f3a741a5 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -686,6 +686,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata, orig_addr = rann->rann_addr; orig_dsn = rann->rann_seq; hopcount = rann->rann_hopcount; + hopcount++; metric = rann->rann_metric; mhwmp_dbg("received RANN from %pM\n", orig_addr); @@ -706,7 +707,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; }