mac80211: Check basic rates when peering

Section 13.2.3 of IEEE 80211s standard requires BSSBasicRateSet of mesh nodes
to be identical to establish peer link.

Signed-off-by: Ashok Nagarajan <ashok@cozybit.com>
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 7b22822d4208a29c550bf5ab02fbf3df6fea8695..133c118526fb749b181ab874d257b85fb8514e07 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -66,11 +66,13 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data)
  *
  * @ie: information elements of a management frame from the mesh peer
  * @sdata: local mesh subif
+ * @basic_rates: BSSBasicRateSet of the peer candidate
  *
  * This function checks if the mesh configuration of a mesh point matches the
  * local mesh configuration, i.e. if both nodes belong to the same mesh network.
  */
-bool mesh_matches_local(struct ieee802_11_elems *ie, struct ieee80211_sub_if_data *sdata)
+bool mesh_matches_local(struct ieee802_11_elems *ie,
+                       struct ieee80211_sub_if_data *sdata, u32 basic_rates)
 {
        struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
        struct ieee80211_local *local = sdata->local;
@@ -94,6 +96,9 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct ieee80211_sub_if_dat
             (ifmsh->mesh_auth_id == ie->mesh_config->meshconf_auth)))
                goto mismatch;
 
+       if (sdata->vif.bss_conf.basic_rates != basic_rates)
+               goto mismatch;
+
        /* disallow peering with mismatched channel types for now */
        if (ie->ht_operation &&
            (local->_oper_channel_type !=
@@ -656,12 +661,12 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
        if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
                return;
 
+       supp_rates = ieee80211_sta_get_rates(local, &elems,
+                                            band, &basic_rates);
+
        if (elems.mesh_id && elems.mesh_config &&
-           mesh_matches_local(&elems, sdata)) {
-               supp_rates = ieee80211_sta_get_rates(local, &elems,
-                                                    band, &basic_rates);
+           mesh_matches_local(&elems, sdata, basic_rates))
                mesh_neighbour_update(mgmt->sa, supp_rates, sdata, &elems);
-       }
 
        if (ifmsh->sync_ops)
                ifmsh->sync_ops->rx_bcn_presp(sdata,

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index fa7d9704c1756268a98e8cba7a625c6c11a70eb9..4ad738988801da72260c2074dc6d4c27bbe7c434 100644 (file)
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -223,7 +223,7 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
 int mesh_rmc_check(u8 *addr, struct ieee80211s_hdr *mesh_hdr,
                struct ieee80211_sub_if_data *sdata);
 bool mesh_matches_local(struct ieee802_11_elems *ie,
-               struct ieee80211_sub_if_data *sdata);
+                       struct ieee80211_sub_if_data *sdata, u32 basic_rates);
 void mesh_ids_set_default(struct ieee80211_if_mesh *mesh);
 void mesh_mgmt_ies_add(struct sk_buff *skb,
                struct ieee80211_sub_if_data *sdata);

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 91e2043bc9b2787df6aa139aa79a73f8ba65baa6..9c836e774fbd8e11cbf93707f641bebc62c46cf3 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -564,7 +564,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                                        rx_status->band, &basic_rates);
 
        if (ftype != WLAN_SP_MESH_PEERING_CLOSE &&
-           (!mesh_matches_local(&elems, sdata))) {
+           (!mesh_matches_local(&elems, sdata, basic_rates))) {
                matches_local = false;
                switch (ftype) {
                case WLAN_SP_MESH_PEERING_OPEN: