Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Chun-Yeow Yeoh <yeohchunyeow@gmail.com>,
        Johannes Berg <johannes.berg@intel.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.14 041/100] mac80211: fix the update of path
 metric for RANN frame
Thread-Topic: [PATCH AUTOSEL for 4.14 041/100] mac80211: fix the update of
 path metric for RANN frame
Thread-Index: AQHTlMndg30s/Reuo0e8h4orHYbGLw==
Date:   Wed, 24 Jan 2018 04:14:44 +0000
Message-ID: <20180124041414.32065-41-alexander.levin@microsoft.com>
References: <20180124041414.32065-1-alexander.levin@microsoft.com>
In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b22b1c20-c5db-49de-ec5a-08d562e11122
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:44.5120
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0998
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>

[ Upstream commit fbbdad5edf0bb59786a51b94a9d006bc8c2da9a2 ]

The previous path metric update from RANN frame has not considered
the own link metric toward the transmitting mesh STA. Fix this.

Reported-by: Michael65535
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 net/mac80211/mesh_hwmp.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index d8bbd0d2225a..d6d3f316de4c 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -797,7 +797,7 @@ static void hwmp_rann_frame_process(struct ieee80211_su=
b_if_data *sdata,
 	struct mesh_path *mpath;
 	u8 ttl, flags, hopcount;
 	const u8 *orig_addr;
-	u32 orig_sn, metric, metric_txsta, interval;
+	u32 orig_sn, new_metric, orig_metric, last_hop_metric, interval;
 	bool root_is_gate;
=20
 	ttl =3D rann->rann_ttl;
@@ -808,7 +808,7 @@ static void hwmp_rann_frame_process(struct ieee80211_su=
b_if_data *sdata,
 	interval =3D le32_to_cpu(rann->rann_interval);
 	hopcount =3D rann->rann_hopcount;
 	hopcount++;
-	metric =3D le32_to_cpu(rann->rann_metric);
+	orig_metric =3D le32_to_cpu(rann->rann_metric);
=20
 	/*  Ignore our own RANNs */
 	if (ether_addr_equal(orig_addr, sdata->vif.addr))
@@ -825,7 +825,10 @@ static void hwmp_rann_frame_process(struct ieee80211_s=
ub_if_data *sdata,
 		return;
 	}
=20
-	metric_txsta =3D airtime_link_metric_get(local, sta);
+	last_hop_metric =3D airtime_link_metric_get(local, sta);
+	new_metric =3D orig_metric + last_hop_metric;
+	if (new_metric < orig_metric)
+		new_metric =3D MAX_METRIC;
=20
 	mpath =3D mesh_path_lookup(sdata, orig_addr);
 	if (!mpath) {
@@ -838,7 +841,7 @@ static void hwmp_rann_frame_process(struct ieee80211_su=
b_if_data *sdata,
 	}
=20
 	if (!(SN_LT(mpath->sn, orig_sn)) &&
-	    !(mpath->sn =3D=3D orig_sn && metric < mpath->rann_metric)) {
+	    !(mpath->sn =3D=3D orig_sn && new_metric < mpath->rann_metric)) {
 		rcu_read_unlock();
 		return;
 	}
@@ -856,7 +859,7 @@ static void hwmp_rann_frame_process(struct ieee80211_su=
b_if_data *sdata,
 	}
=20
 	mpath->sn =3D orig_sn;
-	mpath->rann_metric =3D metric + metric_txsta;
+	mpath->rann_metric =3D new_metric;
 	mpath->is_root =3D true;
 	/* Recording RANNs sender address to send individually
 	 * addressed PREQs destined for root mesh STA */
@@ -876,7 +879,7 @@ static void hwmp_rann_frame_process(struct ieee80211_su=
b_if_data *sdata,
 		mesh_path_sel_frame_tx(MPATH_RANN, flags, orig_addr,
 				       orig_sn, 0, NULL, 0, broadcast_addr,
 				       hopcount, ttl, interval,
-				       metric + metric_txsta, 0, sdata);
+				       new_metric, 0, sdata);
 	}
=20
 	rcu_read_unlock();
--=20
2.11.0