OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 4.4.160 into android-4.4-p
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
net
/
mac80211
/
mesh_hwmp.c
diff --git
a/net/mac80211/mesh_hwmp.c
b/net/mac80211/mesh_hwmp.c
index
f55cddc
..
466922f
100644
(file)
--- a/
net/mac80211/mesh_hwmp.c
+++ b/
net/mac80211/mesh_hwmp.c
@@
-552,6
+552,10
@@
static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
forward = false;
reply = true;
target_metric = 0;
+
+ if (SN_GT(target_sn, ifmsh->sn))
+ ifmsh->sn = target_sn;
+
if (time_after(jiffies, ifmsh->last_sn_update +
net_traversal_jiffies(sdata)) ||
time_before(jiffies, ifmsh->last_sn_update)) {