From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516768182-5-14332414257120062138 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768182; b=bw3CHzhdDa1uTRv8I6PM2wJkzgP7d7tI9udGTs8EsEb4aQJ cHwquUCd1N729hFck/6ZqBnuVVxhnaP6xrvrflhdNuHFx2u4GhzGnfEA0+/hGbjt PCn/dOqjzRW51Unakg0ag799JLrT5iK8pEWUTyPM3ppTBsKUayrs5Rj590DUL6uT A5T8pf/vsanu+hxTIjJEDILlrZ8Zg8Zis2O+UrqnafH4faKa6HLzXl1zwHt6QfVA NWJ6RU/w9TbR7xv1BxaJ0/oZcpsasIHGSWX//60PhnwhyIHN9H+xHfBVSI8v8NCl V4wRa20CvWfIZnEAU4WRoLcnR62f0ah/459bmsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768182; bh=rDoqUk vYWzmdrenx8TMHJmHZbvFtkOorbdBb1ZwnP6w=; b=mxBZCXJgL436qEYHrN47lk Ty2+uUkBn7upgXVBjiji5nT12e182cpNt4CQdYH6Ayu0BURvvwNfSb7Ng7Mxb5fR /VWM1VerATIBfkG8y2jJb2l49Qwhj6Y9O9Xu5d2Rk6pcq276WPzSkdgjz47OJuDM rS5aUuLob5VwTBP5hOR1m61JtLOdQ9lqIHhiKl793vxmUBIUk6RN7MpDdbJ3sYwS zusc3BYp9WfmJ6EKNHr35C3c2FuGcLD4EHcB8HAsRpXY8z5k0vVzxGdOzgFETfea kMkRm3gvRtau70G5Risq3MXUvpsuDAUBWm5JPWyM2HNcAY2G5pECuIs3rqalixXA == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Bss2r985 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Bss2r985 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932834AbeAXE3O (ORCPT ); Tue, 23 Jan 2018 23:29:14 -0500 Received: from mail-dm3nam03on0104.outbound.protection.outlook.com ([104.47.41.104]:64192 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933186AbeAXETY (ORCPT ); Tue, 23 Jan 2018 23:19:24 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Chun-Yeow Yeoh , Johannes Berg , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 14/35] mac80211: fix the update of path metric for RANN frame Thread-Topic: [PATCH AUTOSEL for 4.4 14/35] mac80211: fix the update of path metric for RANN frame Thread-Index: AQHTlMot92FFJW4ALEyDfeQUpEVFKw== Date: Wed, 24 Jan 2018 04:16:59 +0000 Message-ID: <20180124041645.32420-14-alexander.levin@microsoft.com> References: <20180124041645.32420-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041645.32420-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1094;7:2fSzkvNnbeYKDB2QXmFylzBe9enKQuj6JnKY7M8WgSWqSffxP4alADzeqB4elP5ZoTRxMTEhIxaTvPGzC7XxOV83X4qoHssep9LeXaxtT9z5jYnyRXfbpBAbgrTVVJoA1GAbyI/vH4lx7Dh1JzwGQDaFi23m0hodHwc0iqvGw9sSvQc6TE1Mrf+t+PtVI+ssdknIhKljxWVlvqx5yj8njncGIud7hlq1Lwplt+kWVuvGD8kNP06U+nOZdSjjxDPu x-ms-office365-filtering-correlation-id: 71585cfd-7220-4291-6a16-08d562e1a426 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1094; x-ms-traffictypediagnostic: DM5PR2101MB1094: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3231046)(2400081)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1094;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1094; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(14454004)(99286004)(10090500001)(2906002)(86612001)(2900100001)(2950100002)(575784001)(107886003)(5250100002)(2501003)(26005)(316002)(4326008)(97736004)(54906003)(106356001)(110136005)(25786009)(6666003)(5660300001)(36756003)(305945005)(39060400002)(86362001)(8936002)(3280700002)(6116002)(68736007)(102836004)(3660700001)(6512007)(10290500003)(72206003)(1076002)(105586002)(6436002)(22452003)(59450400001)(53936002)(478600001)(3846002)(7736002)(6486002)(6346003)(15650500001)(81156014)(66066001)(6506007)(8676002)(76176011)(81166006)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1094;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 9C07H1jdfzpb86yeqZG508SSZSzeGWDOV8+kWnBnk97mjQV7a099SVPp+JXkGwp7rJKTljnioV07tiOf3wvq4g== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71585cfd-7220-4291-6a16-08d562e1a426 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:16:59.2792 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1094 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Chun-Yeow Yeoh [ 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 Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- 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 c6be0b4f4058..e68a409fc351 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -776,7 +776,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; @@ -787,7 +787,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)) @@ -804,7 +804,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) { @@ -817,7 +820,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; } @@ -835,7 +838,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 */ @@ -855,7 +858,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