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>

1 files changed, 3 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)