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.4 14/35] mac80211: fix the update of path metric for RANN frame
Date: Wed, 24 Jan 2018 04:16:59 +0000 [thread overview]
Message-ID: <20180124041645.32420-14-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180124041645.32420-1-alexander.levin@microsoft.com>
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 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_sub_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;
ttl = rann->rann_ttl;
@@ -787,7 +787,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
interval = le32_to_cpu(rann->rann_interval);
hopcount = rann->rann_hopcount;
hopcount++;
- metric = le32_to_cpu(rann->rann_metric);
+ orig_metric = le32_to_cpu(rann->rann_metric);
/* 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_sub_if_data *sdata,
return;
}
- metric_txsta = airtime_link_metric_get(local, sta);
+ last_hop_metric = airtime_link_metric_get(local, sta);
+ new_metric = orig_metric + last_hop_metric;
+ if (new_metric < orig_metric)
+ new_metric = MAX_METRIC;
mpath = mesh_path_lookup(sdata, orig_addr);
if (!mpath) {
@@ -817,7 +820,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
}
if (!(SN_LT(mpath->sn, orig_sn)) &&
- !(mpath->sn == orig_sn && metric < mpath->rann_metric)) {
+ !(mpath->sn == orig_sn && new_metric < mpath->rann_metric)) {
rcu_read_unlock();
return;
}
@@ -835,7 +838,7 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
}
mpath->sn = orig_sn;
- mpath->rann_metric = metric + metric_txsta;
+ mpath->rann_metric = new_metric;
mpath->is_root = 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_sub_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);
}
rcu_read_unlock();
--
2.11.0
next prev parent reply other threads:[~2018-01-24 4:29 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 4:16 [PATCH AUTOSEL for 4.4 01/35] KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 02/35] KVM: x86: Don't re-execute instruction when not passing CR2 value Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 04/35] KVM: x86: ioapic: Fix level-triggered EOI and IOAPIC reconfigure race Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 03/35] KVM: X86: Fix operand/address-size during instruction decoding Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 05/35] KVM: x86: ioapic: Clear Remote IRR when entry is switched to edge-triggered Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 06/35] KVM: x86: ioapic: Preserve read-only values in the redirection table Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 07/35] ACPI / bus: Leave modalias empty for devices which are not present Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 08/35] cpufreq: Add Loongson machine dependencies Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 10/35] drm/amdgpu: Fix SDMA load/unload sequence on HWS disabled mode Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 09/35] bcache: check return value of register_shrinker Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 11/35] drm/amdkfd: Fix SDMA ring buffer size calculation Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 12/35] drm/amdkfd: Fix SDMA oversubsription handling Sasha Levin
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 13/35] openvswitch: fix the incorrect flow action alloc size Sasha Levin
2018-01-24 4:16 ` Sasha Levin [this message]
2018-01-24 4:16 ` [PATCH AUTOSEL for 4.4 15/35] btrfs: fix deadlock when writing out space cache Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 16/35] KVM: VMX: Fix rflags cache during vCPU reset Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 18/35] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 17/35] xen-netfront: remove warning when unloading module Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 20/35] nfsd: Ensure we check stateid validity in the seqid operation checks Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 19/35] nfsd: Ensure we don't recognise lock stateids after freeing them Sasha Levin
2018-01-24 15:48 ` J. Bruce Fields
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 21/35] grace: replace BUG_ON by WARN_ONCE in exit_net hook Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 22/35] nfsd: check for use of the closed special stateid Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 23/35] lockd: fix "list_add double add" caused by legacy signal interface Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 24/35] hwmon: (pmbus) Use 64bit math for DIRECT format values Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 25/35] net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 27/35] SUNRPC: Allow connect to return EHOSTUNREACH Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 26/35] quota: Check for register_shrinker() failure Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 29/35] drm/omap: Fix error handling path in 'omap_dmm_probe()' Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 28/35] kmemleak: add scheduling point to kmemleak_scan() Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 30/35] xfs: ubsan fixes Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 31/35] scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 32/35] scsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 33/35] media: usbtv: add a new usbid Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 34/35] usb: gadget: don't dereference g until after it has been null checked Sasha Levin
2018-01-24 4:17 ` [PATCH AUTOSEL for 4.4 35/35] staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180124041645.32420-14-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=yeohchunyeow@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).