From 01846516ff91a8e319a19b504567a36f170a3f1d Mon Sep 17 00:00:00 2001 From: "Porsch, Marco" Date: Wed, 24 Feb 2010 09:53:13 +0100 Subject: [PATCH] --- yaml --- r: 189507 b: refs/heads/master c: 533866b12cce484994163b1e201778cbac4c04c5 h: refs/heads/master i: 189505: 492e235e5014dfa26ac98168cff1103a50c88c21 189503: fe48e1c8063b4ee4ee384a02fe5cca07c90d2fe5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 841dd76d903f..ad6ad2c70b6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7a00dc73b7185ab2ebd1aa7ce710c7b4edc77a4 +refs/heads/master: 533866b12cce484994163b1e201778cbac4c04c5 diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index ce84237ebad3..ccff6133e19a 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -391,7 +391,7 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata, if (SN_GT(mpath->sn, orig_sn) || (mpath->sn == orig_sn && action == MPATH_PREQ && - new_metric > mpath->metric)) { + new_metric >= mpath->metric)) { process = false; fresh_info = false; } @@ -611,7 +611,7 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata, mesh_path_sel_frame_tx(MPATH_PREP, flags, orig_addr, cpu_to_le32(orig_sn), 0, target_addr, - cpu_to_le32(target_sn), mpath->next_hop->sta.addr, hopcount, + cpu_to_le32(target_sn), next_hop, hopcount, ttl, cpu_to_le32(lifetime), cpu_to_le32(metric), 0, sdata); rcu_read_unlock();