diff options
| author | Chun-Yeow Yeoh <yeohchunyeow@gmail.com> | 2012-04-10 12:31:56 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 15:10:31 -0400 |
| commit | 35bcd591132c2d4d2a31843063c0f9e64e5be751 (patch) | |
| tree | 7db3b5dc4c2eaccf68ba1e9d396b46f36f54900c /net | |
| parent | 59a4cc2539076f868f2a3fcd7a3385a26928a27a (diff) | |
| download | linux-stable-35bcd591132c2d4d2a31843063c0f9e64e5be751.tar.gz linux-stable-35bcd591132c2d4d2a31843063c0f9e64e5be751.tar.bz2 linux-stable-35bcd591132c2d4d2a31843063c0f9e64e5be751.zip | |
mac80211: fix the assignment of PREQ's MAC address for Proactive RANN
Record the RANN sender's address only for RANNs that meet the acceptance
criteria (per sections 13.10.12.4.2).
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Reviewed-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 5 | ||||
| -rw-r--r-- | net/mac80211/mesh_pathtbl.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index a80da3784a25..503016f58631 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/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/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 49aaefd99635..baa6096c66b4 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/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); |