net: fix skb_seq_read returning wrong offset/length for page frag data
[safe/jmp/linux-2.6] / net / mac80211 / mesh.c
index 697ef67..9a3e5de 100644 (file)
@@ -12,6 +12,9 @@
 #include "ieee80211_i.h"
 #include "mesh.h"
 
+#define IEEE80211_MESH_PEER_INACTIVITY_LIMIT (1800 * HZ)
+#define IEEE80211_MESH_HOUSEKEEPING_INTERVAL (60 * HZ)
+
 #define PP_OFFSET      1               /* Path Selection Protocol */
 #define PM_OFFSET      5               /* Path Selection Metric   */
 #define CC_OFFSET      9               /* Congestion Control Mode */
@@ -35,19 +38,28 @@ void ieee80211s_stop(void)
        kmem_cache_destroy(rm_cache);
 }
 
+static void ieee80211_mesh_housekeeping_timer(unsigned long data)
+{
+       struct ieee80211_sub_if_data *sdata = (void *) data;
+       struct ieee80211_local *local = sdata->local;
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+
+       ifmsh->housekeeping = true;
+       queue_work(local->hw.workqueue, &ifmsh->work);
+}
+
 /**
  * mesh_matches_local - check if the config of a mesh point matches ours
  *
  * @ie: information elements of a management frame from the mesh peer
- * @dev: local mesh interface
+ * @sdata: local mesh subif
  *
  * 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 net_device *dev)
+bool mesh_matches_local(struct ieee802_11_elems *ie, struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-       struct ieee80211_if_sta *sta = &sdata->u.sta;
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
 
        /*
         * As support for each feature is added, check for matching
@@ -59,11 +71,11 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev)
         *   - MDA enabled
         * - Power management control on fc
         */
-       if (sta->mesh_id_len == ie->mesh_id_len &&
-               memcmp(sta->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 &&
-               memcmp(sta->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 &&
-               memcmp(sta->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 &&
-               memcmp(sta->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0)
+       if (ifmsh->mesh_id_len == ie->mesh_id_len &&
+               memcmp(ifmsh->mesh_id, ie->mesh_id, ie->mesh_id_len) == 0 &&
+               memcmp(ifmsh->mesh_pp_id, ie->mesh_config + PP_OFFSET, 4) == 0 &&
+               memcmp(ifmsh->mesh_pm_id, ie->mesh_config + PM_OFFSET, 4) == 0 &&
+               memcmp(ifmsh->mesh_cc_id, ie->mesh_config + CC_OFFSET, 4) == 0)
                return true;
 
        return false;
@@ -73,10 +85,8 @@ bool mesh_matches_local(struct ieee802_11_elems *ie, struct net_device *dev)
  * mesh_peer_accepts_plinks - check if an mp is willing to establish peer links
  *
  * @ie: information elements of a management frame from the mesh peer
- * @dev: local mesh interface
  */
-bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie,
-                             struct net_device *dev)
+bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie)
 {
        return (*(ie->mesh_config + CAPAB_OFFSET) & ACCEPT_PLINKS) != 0;
 }
@@ -98,11 +108,11 @@ void mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata)
         */
        free_plinks = mesh_plink_availables(sdata);
 
-       if (free_plinks != sdata->u.sta.accepting_plinks)
-               ieee80211_sta_timer((unsigned long) sdata);
+       if (free_plinks != sdata->u.mesh.accepting_plinks)
+               ieee80211_mesh_housekeeping_timer((unsigned long) sdata);
 }
 
-void mesh_ids_set_default(struct ieee80211_if_sta *sta)
+void mesh_ids_set_default(struct ieee80211_if_mesh *sta)
 {
        u8 def_id[4] = {0x00, 0x0F, 0xAC, 0xff};
 
@@ -111,28 +121,26 @@ void mesh_ids_set_default(struct ieee80211_if_sta *sta)
        memcpy(sta->mesh_cc_id, def_id, 4);
 }
 
-int mesh_rmc_init(struct net_device *dev)
+int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
        int i;
 
-       sdata->u.sta.rmc = kmalloc(sizeof(struct mesh_rmc), GFP_KERNEL);
-       if (!sdata->u.sta.rmc)
+       sdata->u.mesh.rmc = kmalloc(sizeof(struct mesh_rmc), GFP_KERNEL);
+       if (!sdata->u.mesh.rmc)
                return -ENOMEM;
-       sdata->u.sta.rmc->idx_mask = RMC_BUCKETS - 1;
+       sdata->u.mesh.rmc->idx_mask = RMC_BUCKETS - 1;
        for (i = 0; i < RMC_BUCKETS; i++)
-               INIT_LIST_HEAD(&sdata->u.sta.rmc->bucket[i].list);
+               INIT_LIST_HEAD(&sdata->u.mesh.rmc->bucket[i].list);
        return 0;
 }
 
-void mesh_rmc_free(struct net_device *dev)
+void mesh_rmc_free(struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-       struct mesh_rmc *rmc = sdata->u.sta.rmc;
+       struct mesh_rmc *rmc = sdata->u.mesh.rmc;
        struct rmc_entry *p, *n;
        int i;
 
-       if (!sdata->u.sta.rmc)
+       if (!sdata->u.mesh.rmc)
                return;
 
        for (i = 0; i < RMC_BUCKETS; i++)
@@ -142,7 +150,7 @@ void mesh_rmc_free(struct net_device *dev)
                }
 
        kfree(rmc);
-       sdata->u.sta.rmc = NULL;
+       sdata->u.mesh.rmc = NULL;
 }
 
 /**
@@ -158,10 +166,9 @@ void mesh_rmc_free(struct net_device *dev)
  * it.
  */
 int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
-                  struct net_device *dev)
+                  struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-       struct mesh_rmc *rmc = sdata->u.sta.rmc;
+       struct mesh_rmc *rmc = sdata->u.mesh.rmc;
        u32 seqnum = 0;
        int entries = 0;
        u8 idx;
@@ -194,10 +201,9 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr,
        return 0;
 }
 
-void mesh_mgmt_ies_add(struct sk_buff *skb, struct net_device *dev)
+void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_local *local = sdata->local;
        struct ieee80211_supported_band *sband;
        u8 *pos;
        int len, i, rate;
@@ -224,28 +230,28 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct net_device *dev)
                }
        }
 
-       pos = skb_put(skb, 2 + sdata->u.sta.mesh_id_len);
+       pos = skb_put(skb, 2 + sdata->u.mesh.mesh_id_len);
        *pos++ = WLAN_EID_MESH_ID;
-       *pos++ = sdata->u.sta.mesh_id_len;
-       if (sdata->u.sta.mesh_id_len)
-               memcpy(pos, sdata->u.sta.mesh_id, sdata->u.sta.mesh_id_len);
+       *pos++ = sdata->u.mesh.mesh_id_len;
+       if (sdata->u.mesh.mesh_id_len)
+               memcpy(pos, sdata->u.mesh.mesh_id, sdata->u.mesh.mesh_id_len);
 
        pos = skb_put(skb, 21);
        *pos++ = WLAN_EID_MESH_CONFIG;
-       *pos++ = MESH_CFG_LEN;
+       *pos++ = IEEE80211_MESH_CONFIG_LEN;
        /* Version */
        *pos++ = 1;
 
        /* Active path selection protocol ID */
-       memcpy(pos, sdata->u.sta.mesh_pp_id, 4);
+       memcpy(pos, sdata->u.mesh.mesh_pp_id, 4);
        pos += 4;
 
        /* Active path selection metric ID   */
-       memcpy(pos, sdata->u.sta.mesh_pm_id, 4);
+       memcpy(pos, sdata->u.mesh.mesh_pm_id, 4);
        pos += 4;
 
        /* Congestion control mode identifier */
-       memcpy(pos, sdata->u.sta.mesh_cc_id, 4);
+       memcpy(pos, sdata->u.mesh.mesh_cc_id, 4);
        pos += 4;
 
        /* Channel precedence:
@@ -255,30 +261,20 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct net_device *dev)
        pos += 4;
 
        /* Mesh capability */
-       sdata->u.sta.accepting_plinks = mesh_plink_availables(sdata);
-       *pos++ = sdata->u.sta.accepting_plinks ? ACCEPT_PLINKS : 0x00;
+       sdata->u.mesh.accepting_plinks = mesh_plink_availables(sdata);
+       *pos++ = sdata->u.mesh.accepting_plinks ? ACCEPT_PLINKS : 0x00;
        *pos++ = 0x00;
 
        return;
 }
 
-u32 mesh_table_hash(u8 *addr, struct net_device *dev, struct mesh_table *tbl)
+u32 mesh_table_hash(u8 *addr, struct ieee80211_sub_if_data *sdata, struct mesh_table *tbl)
 {
        /* Use last four bytes of hw addr and interface index as hash index */
-       return jhash_2words(*(u32 *)(addr+2), dev->ifindex, tbl->hash_rnd)
+       return jhash_2words(*(u32 *)(addr+2), sdata->dev->ifindex, tbl->hash_rnd)
                & tbl->hash_mask;
 }
 
-u8 mesh_id_hash(u8 *mesh_id, int mesh_id_len)
-{
-       if (!mesh_id_len)
-               return 1;
-       else if (mesh_id_len == 1)
-               return (u8) mesh_id[0];
-       else
-               return (u8) (mesh_id[0] + 2 * mesh_id[1]);
-}
-
 struct mesh_table *mesh_table_alloc(int size_order)
 {
        int i;
@@ -315,6 +311,13 @@ struct mesh_table *mesh_table_alloc(int size_order)
        return newtbl;
 }
 
+static void __mesh_table_free(struct mesh_table *tbl)
+{
+       kfree(tbl->hash_buckets);
+       kfree(tbl->hashwlock);
+       kfree(tbl);
+}
+
 void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
 {
        struct hlist_head *mesh_hash;
@@ -330,40 +333,33 @@ void mesh_table_free(struct mesh_table *tbl, bool free_leafs)
                }
                spin_unlock(&tbl->hashwlock[i]);
        }
-       kfree(tbl->hash_buckets);
-       kfree(tbl->hashwlock);
-       kfree(tbl);
+       __mesh_table_free(tbl);
 }
 
 static void ieee80211_mesh_path_timer(unsigned long data)
 {
        struct ieee80211_sub_if_data *sdata =
                (struct ieee80211_sub_if_data *) data;
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-       struct ieee80211_local *local = wdev_priv(&sdata->wdev);
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct ieee80211_local *local = sdata->local;
 
-       queue_work(local->hw.workqueue, &ifsta->work);
+       queue_work(local->hw.workqueue, &ifmsh->work);
 }
 
 struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
 {
        struct mesh_table *newtbl;
        struct hlist_head *oldhash;
-       struct hlist_node *p;
-       int err = 0;
+       struct hlist_node *p, *q;
        int i;
 
        if (atomic_read(&tbl->entries)
-                       < tbl->mean_chain_len * (tbl->hash_mask + 1)) {
-               err = -EPERM;
+                       < tbl->mean_chain_len * (tbl->hash_mask + 1))
                goto endgrow;
-       }
 
        newtbl = mesh_table_alloc(tbl->size_order + 1);
-       if (!newtbl) {
-               err = -ENOMEM;
+       if (!newtbl)
                goto endgrow;
-       }
 
        newtbl->free_node = tbl->free_node;
        newtbl->mean_chain_len = tbl->mean_chain_len;
@@ -373,13 +369,19 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
        oldhash = tbl->hash_buckets;
        for (i = 0; i <= tbl->hash_mask; i++)
                hlist_for_each(p, &oldhash[i])
-                       tbl->copy_node(p, newtbl);
+                       if (tbl->copy_node(p, newtbl) < 0)
+                               goto errcopy;
+
+       return newtbl;
 
+errcopy:
+       for (i = 0; i <= newtbl->hash_mask; i++) {
+               hlist_for_each_safe(p, q, &newtbl->hash_buckets[i])
+                       tbl->free_node(p, 0);
+       }
+       __mesh_table_free(newtbl);
 endgrow:
-       if (err)
-               return NULL;
-       else
-               return newtbl;
+       return NULL;
 }
 
 /**
@@ -393,50 +395,265 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
                struct ieee80211_sub_if_data *sdata)
 {
        meshhdr->flags = 0;
-       meshhdr->ttl = sdata->u.sta.mshcfg.dot11MeshTTL;
-       put_unaligned(cpu_to_le32(sdata->u.sta.mesh_seqnum), &meshhdr->seqnum);
-       sdata->u.sta.mesh_seqnum++;
+       meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL;
+       put_unaligned(cpu_to_le32(sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum);
+       sdata->u.mesh.mesh_seqnum++;
 
        return 6;
 }
 
+static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
+                          struct ieee80211_if_mesh *ifmsh)
+{
+       bool free_plinks;
+
+#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+       printk(KERN_DEBUG "%s: running mesh housekeeping\n",
+              sdata->dev->name);
+#endif
+
+       ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
+       mesh_path_expire(sdata);
+
+       free_plinks = mesh_plink_availables(sdata);
+       if (free_plinks != sdata->u.mesh.accepting_plinks)
+               ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON);
+
+       ifmsh->housekeeping = false;
+       mod_timer(&ifmsh->housekeeping_timer,
+                 round_jiffies(jiffies + IEEE80211_MESH_HOUSEKEEPING_INTERVAL));
+}
+
+
+void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct ieee80211_local *local = sdata->local;
+
+       ifmsh->housekeeping = true;
+       queue_work(local->hw.workqueue, &ifmsh->work);
+       ieee80211_if_config(sdata, IEEE80211_IFCC_BEACON |
+                                  IEEE80211_IFCC_BEACON_ENABLED);
+}
+
+void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
+{
+       del_timer_sync(&sdata->u.mesh.housekeeping_timer);
+       /*
+        * If the timer fired while we waited for it, it will have
+        * requeued the work. Now the work will be running again
+        * but will not rearm the timer again because it checks
+        * whether the interface is running, which, at this point,
+        * it no longer is.
+        */
+       cancel_work_sync(&sdata->u.mesh.work);
+
+       /*
+        * When we get here, the interface is marked down.
+        * Call synchronize_rcu() to wait for the RX path
+        * should it be using the interface and enqueuing
+        * frames at this very time on another CPU.
+        */
+       synchronize_rcu();
+       skb_queue_purge(&sdata->u.mesh.skb_queue);
+}
+
+static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
+                                       u16 stype,
+                                       struct ieee80211_mgmt *mgmt,
+                                       size_t len,
+                                       struct ieee80211_rx_status *rx_status)
+{
+       struct ieee80211_local *local = sdata->local;
+       struct ieee802_11_elems elems;
+       struct ieee80211_channel *channel;
+       u32 supp_rates = 0;
+       size_t baselen;
+       int freq;
+       enum ieee80211_band band = rx_status->band;
+
+       /* ignore ProbeResp to foreign address */
+       if (stype == IEEE80211_STYPE_PROBE_RESP &&
+           compare_ether_addr(mgmt->da, sdata->dev->dev_addr))
+               return;
+
+       baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
+       if (baselen > len)
+               return;
+
+       ieee802_11_parse_elems(mgmt->u.probe_resp.variable, len - baselen,
+                              &elems);
+
+       if (elems.ds_params && elems.ds_params_len == 1)
+               freq = ieee80211_channel_to_frequency(elems.ds_params[0]);
+       else
+               freq = rx_status->freq;
+
+       channel = ieee80211_get_channel(local->hw.wiphy, freq);
+
+       if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
+               return;
+
+       if (elems.mesh_id && elems.mesh_config &&
+           mesh_matches_local(&elems, sdata)) {
+               supp_rates = ieee80211_sta_get_rates(local, &elems, band);
+
+               mesh_neighbour_update(mgmt->sa, supp_rates, sdata,
+                                     mesh_peer_accepts_plinks(&elems));
+       }
+}
+
+static void ieee80211_mesh_rx_mgmt_action(struct ieee80211_sub_if_data *sdata,
+                                         struct ieee80211_mgmt *mgmt,
+                                         size_t len,
+                                         struct ieee80211_rx_status *rx_status)
+{
+       switch (mgmt->u.action.category) {
+       case PLINK_CATEGORY:
+               mesh_rx_plink_frame(sdata, mgmt, len, rx_status);
+               break;
+       case MESH_PATH_SEL_CATEGORY:
+               mesh_rx_path_sel_frame(sdata, mgmt, len);
+               break;
+       }
+}
+
+static void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
+                                         struct sk_buff *skb)
+{
+       struct ieee80211_rx_status *rx_status;
+       struct ieee80211_if_mesh *ifmsh;
+       struct ieee80211_mgmt *mgmt;
+       u16 stype;
+
+       ifmsh = &sdata->u.mesh;
+
+       rx_status = (struct ieee80211_rx_status *) skb->cb;
+       mgmt = (struct ieee80211_mgmt *) skb->data;
+       stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
+
+       switch (stype) {
+       case IEEE80211_STYPE_PROBE_RESP:
+       case IEEE80211_STYPE_BEACON:
+               ieee80211_mesh_rx_bcn_presp(sdata, stype, mgmt, skb->len,
+                                           rx_status);
+               break;
+       case IEEE80211_STYPE_ACTION:
+               ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status);
+               break;
+       }
+
+       kfree_skb(skb);
+}
+
+static void ieee80211_mesh_work(struct work_struct *work)
+{
+       struct ieee80211_sub_if_data *sdata =
+               container_of(work, struct ieee80211_sub_if_data, u.mesh.work);
+       struct ieee80211_local *local = sdata->local;
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct sk_buff *skb;
+
+       if (!netif_running(sdata->dev))
+               return;
+
+       if (local->sw_scanning || local->hw_scanning)
+               return;
+
+       while ((skb = skb_dequeue(&ifmsh->skb_queue)))
+               ieee80211_mesh_rx_queued_mgmt(sdata, skb);
+
+       if (ifmsh->preq_queue_len &&
+           time_after(jiffies,
+                      ifmsh->last_preq + msecs_to_jiffies(ifmsh->mshcfg.dot11MeshHWMPpreqMinInterval)))
+               mesh_path_start_discovery(sdata);
+
+       if (ifmsh->housekeeping)
+               ieee80211_mesh_housekeeping(sdata, ifmsh);
+}
+
+void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
+{
+       struct ieee80211_sub_if_data *sdata;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(sdata, &local->interfaces, list)
+               if (ieee80211_vif_is_mesh(&sdata->vif))
+                       queue_work(local->hw.workqueue, &sdata->u.mesh.work);
+       rcu_read_unlock();
+}
+
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_if_sta *ifsta = &sdata->u.sta;
-
-       ifsta->mshcfg.dot11MeshRetryTimeout = MESH_RET_T;
-       ifsta->mshcfg.dot11MeshConfirmTimeout = MESH_CONF_T;
-       ifsta->mshcfg.dot11MeshHoldingTimeout = MESH_HOLD_T;
-       ifsta->mshcfg.dot11MeshMaxRetries = MESH_MAX_RETR;
-       ifsta->mshcfg.dot11MeshTTL = MESH_TTL;
-       ifsta->mshcfg.auto_open_plinks = true;
-       ifsta->mshcfg.dot11MeshMaxPeerLinks =
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+
+       INIT_WORK(&ifmsh->work, ieee80211_mesh_work);
+       setup_timer(&ifmsh->housekeeping_timer,
+                   ieee80211_mesh_housekeeping_timer,
+                   (unsigned long) sdata);
+       skb_queue_head_init(&sdata->u.mesh.skb_queue);
+
+       ifmsh->mshcfg.dot11MeshRetryTimeout = MESH_RET_T;
+       ifmsh->mshcfg.dot11MeshConfirmTimeout = MESH_CONF_T;
+       ifmsh->mshcfg.dot11MeshHoldingTimeout = MESH_HOLD_T;
+       ifmsh->mshcfg.dot11MeshMaxRetries = MESH_MAX_RETR;
+       ifmsh->mshcfg.dot11MeshTTL = MESH_TTL;
+       ifmsh->mshcfg.auto_open_plinks = true;
+       ifmsh->mshcfg.dot11MeshMaxPeerLinks =
                MESH_MAX_ESTAB_PLINKS;
-       ifsta->mshcfg.dot11MeshHWMPactivePathTimeout =
+       ifmsh->mshcfg.dot11MeshHWMPactivePathTimeout =
                MESH_PATH_TIMEOUT;
-       ifsta->mshcfg.dot11MeshHWMPpreqMinInterval =
+       ifmsh->mshcfg.dot11MeshHWMPpreqMinInterval =
                MESH_PREQ_MIN_INT;
-       ifsta->mshcfg.dot11MeshHWMPnetDiameterTraversalTime =
+       ifmsh->mshcfg.dot11MeshHWMPnetDiameterTraversalTime =
                MESH_DIAM_TRAVERSAL_TIME;
-       ifsta->mshcfg.dot11MeshHWMPmaxPREQretries =
+       ifmsh->mshcfg.dot11MeshHWMPmaxPREQretries =
                MESH_MAX_PREQ_RETRIES;
-       ifsta->mshcfg.path_refresh_time =
+       ifmsh->mshcfg.path_refresh_time =
                MESH_PATH_REFRESH_TIME;
-       ifsta->mshcfg.min_discovery_timeout =
+       ifmsh->mshcfg.min_discovery_timeout =
                MESH_MIN_DISCOVERY_TIMEOUT;
-       ifsta->accepting_plinks = true;
-       ifsta->preq_id = 0;
-       ifsta->dsn = 0;
-       atomic_set(&ifsta->mpaths, 0);
-       mesh_rmc_init(sdata->dev);
-       ifsta->last_preq = jiffies;
+       ifmsh->accepting_plinks = true;
+       ifmsh->preq_id = 0;
+       ifmsh->dsn = 0;
+       atomic_set(&ifmsh->mpaths, 0);
+       mesh_rmc_init(sdata);
+       ifmsh->last_preq = jiffies;
        /* Allocate all mesh structures when creating the first mesh interface. */
        if (!mesh_allocated)
                ieee80211s_init();
-       mesh_ids_set_default(ifsta);
-       setup_timer(&ifsta->mesh_path_timer,
+       mesh_ids_set_default(ifmsh);
+       setup_timer(&ifmsh->mesh_path_timer,
                    ieee80211_mesh_path_timer,
                    (unsigned long) sdata);
-       INIT_LIST_HEAD(&ifsta->preq_queue.list);
-       spin_lock_init(&ifsta->mesh_preq_queue_lock);
+       INIT_LIST_HEAD(&ifmsh->preq_queue.list);
+       spin_lock_init(&ifmsh->mesh_preq_queue_lock);
+}
+
+ieee80211_rx_result
+ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
+                      struct ieee80211_rx_status *rx_status)
+{
+       struct ieee80211_local *local = sdata->local;
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct ieee80211_mgmt *mgmt;
+       u16 fc;
+
+       if (skb->len < 24)
+               return RX_DROP_MONITOR;
+
+       mgmt = (struct ieee80211_mgmt *) skb->data;
+       fc = le16_to_cpu(mgmt->frame_control);
+
+       switch (fc & IEEE80211_FCTL_STYPE) {
+       case IEEE80211_STYPE_PROBE_RESP:
+       case IEEE80211_STYPE_BEACON:
+       case IEEE80211_STYPE_ACTION:
+               memcpy(skb->cb, rx_status, sizeof(*rx_status));
+               skb_queue_tail(&ifmsh->skb_queue, skb);
+               queue_work(local->hw.workqueue, &ifmsh->work);
+               return RX_QUEUED;
+       }
+
+       return RX_CONTINUE;
 }