From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516768862-2-3661769341290674 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=1516768861; b=OFCyZ+i5eqb08ihlonM6FyAMs+ivX776qNz2t4cok7bF0nl Vf27tA1rDd0Bu7cVohKXmnRKDvOHwWQDwJK052a3ZSVbfuMGxAgpmsp8XWt8lkNT 3EyhtqHFQfXCLcA9VH55y8kLNzlEOUGrgUz8cOjFz9wyxAfN6CgfNpWRxt3kLI1v 4rbj2Xq08wE6JYrUnTp86+yRorHbz3tqTJFZYw6tMDqcYCfiO9OtMuXZ4K3CZ5+k wNauzTqRH9unoDAtAS0E3WkplwX89EW9Gn/O2ydOiBxJh22hJhMrGlcl3uShoI61 q10z8EuHyFTP3zbdIGd6Z+wPYstdICwJa5OLEzg== 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=1516768861; bh=DHiguY r28fuMjSri/49R3CYA1USD+JsNGX9RHmxhLH8=; b=dLWMDjeOESEUZiTN9A/CIs Esx3GN3XsxoKSPD+QO/dcrjCsOJHiAxf89m5LTiPTvw7LpN4EDAdUTmzl/cA9hQy XINVk7P2fcXfdTK9OMVoGKnjC+BixIs4qsSsJTXdI75ntcyzVheoSfyixjnssdJi amJoAlLlQno9OtRjiV1V7Hi56LBKBVMKXzg680NOiWKCQoXjbS7qub6HtTkt/Qcf 9yeI8Uu3+zrzAys0NYmy9FinwPLzeDr9MD3YQA3ZJ3LzkQev+MzVCSo0N3GzK0Ha UPH9tz71ODBB4vOvAMqvhwrPx4R5d+JNhzj8exM4KxokksQigIgmEjpcMyB8z2qQ == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OMyR4jQP 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: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OMyR4jQP 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 S932675AbeAXERC (ORCPT ); Tue, 23 Jan 2018 23:17:02 -0500 Received: from mail-cys01nam02on0121.outbound.protection.outlook.com ([104.47.37.121]:64896 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932706AbeAXEQ4 (ORCPT ); Tue, 23 Jan 2018 23:16:56 -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.9 17/55] mac80211: fix the update of path metric for RANN frame Thread-Topic: [PATCH AUTOSEL for 4.9 17/55] mac80211: fix the update of path metric for RANN frame Thread-Index: AQHTlMn8kjUgjCbGPUqz0/UPM88pEg== Date: Wed, 24 Jan 2018 04:15:37 +0000 Message-ID: <20180124041521.32223-17-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB1080;7:RJTKtbTwOKgTqauIV5vlNp849WeLvw7A44kHANKNdBLrblZhh/sHj+JJkgNK8KZ6Fde+s6ERb3As+ChnqPxL3qj5N3GolilDnEa/mWjMN8R9XLpfR4mA3/SgQKNfOrcTpdtsQQTnetYC+M8Fso7+7wSL6pIWCeym8rrOvZ9qtFh0BASo+ircxWI2iDU9CwAuH3Slt5xPAVIBG/oUv+scs9e5NX8mKmhMgT6EBToiJj9jfykKVQmY3oyZvUyIOUYH x-ms-office365-filtering-correlation-id: c4053936-63e1-4f4a-4354-08d562e14a48 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:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: 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)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1080;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1080; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(346002)(39860400002)(39380400002)(366004)(189003)(199004)(72206003)(110136005)(316002)(5250100002)(6346003)(2900100001)(54906003)(1076002)(6116002)(3846002)(15650500001)(22452003)(36756003)(53936002)(99286004)(6512007)(68736007)(2501003)(3660700001)(14454004)(3280700002)(86362001)(102836004)(7736002)(5660300001)(305945005)(575784001)(107886003)(6486002)(6506007)(2906002)(81156014)(26005)(25786009)(4326008)(81166006)(39060400002)(105586002)(8936002)(59450400001)(106356001)(478600001)(10290500003)(6436002)(8676002)(2950100002)(86612001)(97736004)(76176011)(6666003)(10090500001)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1080;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: iV0vpjyS8+lczdLoh72QHEUN5GdBFiCmHdld+U3Xavh55fdTVtZPPj+Qdjg75eTS0MTBaENbZp4RCI7KKkESDw== 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: c4053936-63e1-4f4a-4354-08d562e14a48 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:37.4186 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 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 b747c9645e43..fed598a202c8 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -788,7 +788,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; @@ -799,7 +799,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)) @@ -816,7 +816,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) { @@ -829,7 +832,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; } @@ -847,7 +850,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 */ @@ -867,7 +870,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