From 9f3b420888f3f5300c23bd00f3ca77fd2d957b2f Mon Sep 17 00:00:00 2001 From: Chun-Yeow Yeoh Date: Tue, 10 Apr 2012 12:31:56 +0800 Subject: [PATCH] --- yaml --- r: 300868 b: refs/heads/master c: 35bcd591132c2d4d2a31843063c0f9e64e5be751 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 5 +++-- trunk/net/mac80211/mesh_pathtbl.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index af4b99b67492..10f52e28f202 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59a4cc2539076f868f2a3fcd7a3385a26928a27a +refs/heads/master: 35bcd591132c2d4d2a31843063c0f9e64e5be751 diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index a80da3784a25..503016f58631 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -800,10 +800,11 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata, 0, sdata); mpath->sn = orig_sn; mpath->rann_metric = metric + metric_txsta; + /* Recording RANNs sender address to send individually + * addressed PREQs destined for root mesh STA */ + memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN); } - /* Using individually addressed PREQ for root node */ - memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN); mpath->is_root = true; if (root_is_gate) diff --git a/trunk/net/mac80211/mesh_pathtbl.c b/trunk/net/mac80211/mesh_pathtbl.c index 49aaefd99635..baa6096c66b4 100644 --- a/trunk/net/mac80211/mesh_pathtbl.c +++ b/trunk/net/mac80211/mesh_pathtbl.c @@ -538,6 +538,8 @@ int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata) read_lock_bh(&pathtbl_resize_lock); memcpy(new_mpath->dst, dst, ETH_ALEN); + memset(new_mpath->rann_snd_addr, 0xff, ETH_ALEN); + new_mpath->is_root = false; new_mpath->sdata = sdata; new_mpath->flags = 0; skb_queue_head_init(&new_mpath->frame_queue);