mac80211: introduce ieee80211_beacon_get_tim()
[safe/jmp/linux-2.6] / net / mac80211 / mesh_pathtbl.c
index 135022d..751c4d0 100644 (file)
@@ -9,7 +9,6 @@
 
 #include <linux/etherdevice.h>
 #include <linux/list.h>
-#include <linux/netdevice.h>
 #include <linux/random.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
@@ -37,6 +36,72 @@ struct mpath_node {
 };
 
 static struct mesh_table *mesh_paths;
+static struct mesh_table *mpp_paths; /* Store paths for MPP&MAP */
+
+int mesh_paths_generation;
+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;
+       struct hlist_node *p, *q;
+       int i;
+
+       mesh_hash = tbl->hash_buckets;
+       for (i = 0; i <= tbl->hash_mask; i++) {
+               spin_lock(&tbl->hashwlock[i]);
+               hlist_for_each_safe(p, q, &mesh_hash[i]) {
+                       tbl->free_node(p, free_leafs);
+                       atomic_dec(&tbl->entries);
+               }
+               spin_unlock(&tbl->hashwlock[i]);
+       }
+       __mesh_table_free(tbl);
+}
+
+static struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
+{
+       struct mesh_table *newtbl;
+       struct hlist_head *oldhash;
+       struct hlist_node *p, *q;
+       int i;
+
+       if (atomic_read(&tbl->entries)
+                       < tbl->mean_chain_len * (tbl->hash_mask + 1))
+               goto endgrow;
+
+       newtbl = mesh_table_alloc(tbl->size_order + 1);
+       if (!newtbl)
+               goto endgrow;
+
+       newtbl->free_node = tbl->free_node;
+       newtbl->mean_chain_len = tbl->mean_chain_len;
+       newtbl->copy_node = tbl->copy_node;
+       atomic_set(&newtbl->entries, atomic_read(&tbl->entries));
+
+       oldhash = tbl->hash_buckets;
+       for (i = 0; i <= tbl->hash_mask; i++)
+               hlist_for_each(p, &oldhash[i])
+                       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:
+       return NULL;
+}
+
 
 /* This lock will have the grow table function as writer and add / delete nodes
  * as readers. When reading the table (i.e. doing lookups) we are well protected
@@ -55,20 +120,38 @@ static DEFINE_RWLOCK(pathtbl_resize_lock);
  */
 void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta)
 {
+       struct sk_buff *skb;
+       struct ieee80211_hdr *hdr;
+       struct sk_buff_head tmpq;
+       unsigned long flags;
+
        rcu_assign_pointer(mpath->next_hop, sta);
+
+       __skb_queue_head_init(&tmpq);
+
+       spin_lock_irqsave(&mpath->frame_queue.lock, flags);
+
+       while ((skb = __skb_dequeue(&mpath->frame_queue)) != NULL) {
+               hdr = (struct ieee80211_hdr *) skb->data;
+               memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);
+               __skb_queue_tail(&tmpq, skb);
+       }
+
+       skb_queue_splice(&tmpq, &mpath->frame_queue);
+       spin_unlock_irqrestore(&mpath->frame_queue.lock, flags);
 }
 
 
 /**
  * mesh_path_lookup - look up a path in the mesh path table
  * @dst: hardware address (ETH_ALEN length) of destination
- * @dev: local interface
+ * @sdata: local subif
  *
  * Returns: pointer to the mesh path structure, or NULL if not found
  *
  * Locking: must be called within a read rcu section.
  */
-struct mesh_path *mesh_path_lookup(u8 *dst, struct net_device *dev)
+struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
 {
        struct mesh_path *mpath;
        struct hlist_node *n;
@@ -78,10 +161,10 @@ struct mesh_path *mesh_path_lookup(u8 *dst, struct net_device *dev)
 
        tbl = rcu_dereference(mesh_paths);
 
-       bucket = &tbl->hash_buckets[mesh_table_hash(dst, dev, tbl)];
+       bucket = &tbl->hash_buckets[mesh_table_hash(dst, sdata, tbl)];
        hlist_for_each_entry_rcu(node, n, bucket, list) {
                mpath = node->mpath;
-               if (mpath->dev == dev &&
+               if (mpath->sdata == sdata &&
                                memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
                        if (MPATH_EXPIRED(mpath)) {
                                spin_lock_bh(&mpath->state_lock);
@@ -95,23 +178,53 @@ struct mesh_path *mesh_path_lookup(u8 *dst, struct net_device *dev)
        return NULL;
 }
 
+struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata)
+{
+       struct mesh_path *mpath;
+       struct hlist_node *n;
+       struct hlist_head *bucket;
+       struct mesh_table *tbl;
+       struct mpath_node *node;
+
+       tbl = rcu_dereference(mpp_paths);
+
+       bucket = &tbl->hash_buckets[mesh_table_hash(dst, sdata, tbl)];
+       hlist_for_each_entry_rcu(node, n, bucket, list) {
+               mpath = node->mpath;
+               if (mpath->sdata == sdata &&
+                   memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
+                       if (MPATH_EXPIRED(mpath)) {
+                               spin_lock_bh(&mpath->state_lock);
+                               if (MPATH_EXPIRED(mpath))
+                                       mpath->flags &= ~MESH_PATH_ACTIVE;
+                               spin_unlock_bh(&mpath->state_lock);
+                       }
+                       return mpath;
+               }
+       }
+       return NULL;
+}
+
+
 /**
  * mesh_path_lookup_by_idx - look up a path in the mesh path table by its index
  * @idx: index
- * @dev: local interface
+ * @sdata: local subif, or NULL for all entries
  *
  * Returns: pointer to the mesh path structure, or NULL if not found.
  *
  * Locking: must be called within a read rcu section.
  */
-struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
+struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data *sdata)
 {
        struct mpath_node *node;
        struct hlist_node *p;
        int i;
        int j = 0;
 
-       for_each_mesh_entry(mesh_paths, p, node, i)
+       for_each_mesh_entry(mesh_paths, p, node, i) {
+               if (sdata && node->mpath->sdata != sdata)
+                       continue;
                if (j++ == idx) {
                        if (MPATH_EXPIRED(node->mpath)) {
                                spin_lock_bh(&node->mpath->state_lock);
@@ -121,6 +234,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
                        }
                        return node->mpath;
                }
+       }
 
        return NULL;
 }
@@ -128,15 +242,16 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct net_device *dev)
 /**
  * mesh_path_add - allocate and add a new path to the mesh path table
  * @addr: destination address of the path (ETH_ALEN length)
- * @dev: local interface
+ * @sdata: local subif
  *
  * Returns: 0 on sucess
  *
  * State: the initial state of the new path is set to 0
  */
-int mesh_path_add(u8 *dst, struct net_device *dev)
+int mesh_path_add(u8 *dst, struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct ieee80211_local *local = sdata->local;
        struct mesh_path *mpath, *new_mpath;
        struct mpath_node *node, *new_node;
        struct hlist_head *bucket;
@@ -145,29 +260,30 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
        int err = 0;
        u32 hash_idx;
 
-       if (memcmp(dst, dev->dev_addr, ETH_ALEN) == 0)
+       if (memcmp(dst, sdata->dev->dev_addr, ETH_ALEN) == 0)
                /* never add ourselves as neighbours */
                return -ENOTSUPP;
 
        if (is_multicast_ether_addr(dst))
                return -ENOTSUPP;
 
-       if (atomic_add_unless(&sdata->u.sta.mpaths, 1, MESH_MAX_MPATHS) == 0)
+       if (atomic_add_unless(&sdata->u.mesh.mpaths, 1, MESH_MAX_MPATHS) == 0)
                return -ENOSPC;
 
-       read_lock(&pathtbl_resize_lock);
+       err = -ENOMEM;
+       new_mpath = kzalloc(sizeof(struct mesh_path), GFP_ATOMIC);
+       if (!new_mpath)
+               goto err_path_alloc;
 
-       new_mpath = kzalloc(sizeof(struct mesh_path), GFP_KERNEL);
-       if (!new_mpath) {
-               atomic_dec(&sdata->u.sta.mpaths);
-               err = -ENOMEM;
-               goto endadd2;
-       }
+       new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
+       if (!new_node)
+               goto err_node_alloc;
+
+       read_lock(&pathtbl_resize_lock);
        memcpy(new_mpath->dst, dst, ETH_ALEN);
-       new_mpath->dev = dev;
+       new_mpath->sdata = sdata;
        new_mpath->flags = 0;
        skb_queue_head_init(&new_mpath->frame_queue);
-       new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL);
        new_node->mpath = new_mpath;
        new_mpath->timer.data = (unsigned long) new_mpath;
        new_mpath->timer.function = mesh_path_timer;
@@ -175,21 +291,16 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
        spin_lock_init(&new_mpath->state_lock);
        init_timer(&new_mpath->timer);
 
-       hash_idx = mesh_table_hash(dst, dev, mesh_paths);
+       hash_idx = mesh_table_hash(dst, sdata, mesh_paths);
        bucket = &mesh_paths->hash_buckets[hash_idx];
 
        spin_lock(&mesh_paths->hashwlock[hash_idx]);
 
+       err = -EEXIST;
        hlist_for_each_entry(node, n, bucket, list) {
                mpath = node->mpath;
-               if (mpath->dev == dev && memcmp(dst, mpath->dst, ETH_ALEN)
-                               == 0) {
-                       err = -EEXIST;
-                       atomic_dec(&sdata->u.sta.mpaths);
-                       kfree(new_node);
-                       kfree(new_mpath);
-                       goto endadd;
-               }
+               if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
+                       goto err_exists;
        }
 
        hlist_add_head_rcu(&new_node->list, bucket);
@@ -197,25 +308,133 @@ int mesh_path_add(u8 *dst, struct net_device *dev)
                mesh_paths->mean_chain_len * (mesh_paths->hash_mask + 1))
                grow = 1;
 
-endadd:
+       mesh_paths_generation++;
+
        spin_unlock(&mesh_paths->hashwlock[hash_idx]);
-endadd2:
        read_unlock(&pathtbl_resize_lock);
-       if (!err && grow) {
-               struct mesh_table *oldtbl, *newtbl;
-
-               write_lock(&pathtbl_resize_lock);
-               oldtbl = mesh_paths;
-               newtbl = mesh_table_grow(mesh_paths);
-               if (!newtbl) {
-                       write_unlock(&pathtbl_resize_lock);
-                       return -ENOMEM;
-               }
-               rcu_assign_pointer(mesh_paths, newtbl);
-               synchronize_rcu();
-               mesh_table_free(oldtbl, false);
+       if (grow) {
+               set_bit(MESH_WORK_GROW_MPATH_TABLE,  &ifmsh->wrkq_flags);
+               ieee80211_queue_work(&local->hw, &ifmsh->work);
+       }
+       return 0;
+
+err_exists:
+       spin_unlock(&mesh_paths->hashwlock[hash_idx]);
+       read_unlock(&pathtbl_resize_lock);
+       kfree(new_node);
+err_node_alloc:
+       kfree(new_mpath);
+err_path_alloc:
+       atomic_dec(&sdata->u.mesh.mpaths);
+       return err;
+}
+
+void mesh_mpath_table_grow(void)
+{
+       struct mesh_table *oldtbl, *newtbl;
+
+       write_lock(&pathtbl_resize_lock);
+       oldtbl = mesh_paths;
+       newtbl = mesh_table_grow(mesh_paths);
+       if (!newtbl) {
+               write_unlock(&pathtbl_resize_lock);
+               return;
+       }
+       rcu_assign_pointer(mesh_paths, newtbl);
+       write_unlock(&pathtbl_resize_lock);
+
+       synchronize_rcu();
+       mesh_table_free(oldtbl, false);
+}
+
+void mesh_mpp_table_grow(void)
+{
+       struct mesh_table *oldtbl, *newtbl;
+
+       write_lock(&pathtbl_resize_lock);
+       oldtbl = mpp_paths;
+       newtbl = mesh_table_grow(mpp_paths);
+       if (!newtbl) {
                write_unlock(&pathtbl_resize_lock);
+               return;
        }
+       rcu_assign_pointer(mpp_paths, newtbl);
+       write_unlock(&pathtbl_resize_lock);
+
+       synchronize_rcu();
+       mesh_table_free(oldtbl, false);
+}
+
+int mpp_path_add(u8 *dst, u8 *mpp, struct ieee80211_sub_if_data *sdata)
+{
+       struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+       struct ieee80211_local *local = sdata->local;
+       struct mesh_path *mpath, *new_mpath;
+       struct mpath_node *node, *new_node;
+       struct hlist_head *bucket;
+       struct hlist_node *n;
+       int grow = 0;
+       int err = 0;
+       u32 hash_idx;
+
+       if (memcmp(dst, sdata->dev->dev_addr, ETH_ALEN) == 0)
+               /* never add ourselves as neighbours */
+               return -ENOTSUPP;
+
+       if (is_multicast_ether_addr(dst))
+               return -ENOTSUPP;
+
+       err = -ENOMEM;
+       new_mpath = kzalloc(sizeof(struct mesh_path), GFP_ATOMIC);
+       if (!new_mpath)
+               goto err_path_alloc;
+
+       new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
+       if (!new_node)
+               goto err_node_alloc;
+
+       read_lock(&pathtbl_resize_lock);
+       memcpy(new_mpath->dst, dst, ETH_ALEN);
+       memcpy(new_mpath->mpp, mpp, ETH_ALEN);
+       new_mpath->sdata = sdata;
+       new_mpath->flags = 0;
+       skb_queue_head_init(&new_mpath->frame_queue);
+       new_node->mpath = new_mpath;
+       new_mpath->exp_time = jiffies;
+       spin_lock_init(&new_mpath->state_lock);
+
+       hash_idx = mesh_table_hash(dst, sdata, mpp_paths);
+       bucket = &mpp_paths->hash_buckets[hash_idx];
+
+       spin_lock(&mpp_paths->hashwlock[hash_idx]);
+
+       err = -EEXIST;
+       hlist_for_each_entry(node, n, bucket, list) {
+               mpath = node->mpath;
+               if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
+                       goto err_exists;
+       }
+
+       hlist_add_head_rcu(&new_node->list, bucket);
+       if (atomic_inc_return(&mpp_paths->entries) >=
+               mpp_paths->mean_chain_len * (mpp_paths->hash_mask + 1))
+               grow = 1;
+
+       spin_unlock(&mpp_paths->hashwlock[hash_idx]);
+       read_unlock(&pathtbl_resize_lock);
+       if (grow) {
+               set_bit(MESH_WORK_GROW_MPP_TABLE,  &ifmsh->wrkq_flags);
+               ieee80211_queue_work(&local->hw, &ifmsh->work);
+       }
+       return 0;
+
+err_exists:
+       spin_unlock(&mpp_paths->hashwlock[hash_idx]);
+       read_unlock(&pathtbl_resize_lock);
+       kfree(new_node);
+err_node_alloc:
+       kfree(new_mpath);
+err_path_alloc:
        return err;
 }
 
@@ -233,7 +452,7 @@ void mesh_plink_broken(struct sta_info *sta)
        struct mesh_path *mpath;
        struct mpath_node *node;
        struct hlist_node *p;
-       struct net_device *dev = sta->sdata->dev;
+       struct ieee80211_sub_if_data *sdata = sta->sdata;
        int i;
 
        rcu_read_lock();
@@ -248,13 +467,12 @@ void mesh_plink_broken(struct sta_info *sta)
                        spin_unlock_bh(&mpath->state_lock);
                        mesh_path_error_tx(mpath->dst,
                                        cpu_to_le32(mpath->dsn),
-                                       dev->broadcast, dev);
+                                       sdata->dev->broadcast, sdata);
                } else
                spin_unlock_bh(&mpath->state_lock);
        }
        rcu_read_unlock();
 }
-EXPORT_SYMBOL(mesh_plink_broken);
 
 /**
  * mesh_path_flush_by_nexthop - Deletes mesh paths if their next hop matches
@@ -277,11 +495,11 @@ void mesh_path_flush_by_nexthop(struct sta_info *sta)
        for_each_mesh_entry(mesh_paths, p, node, i) {
                mpath = node->mpath;
                if (mpath->next_hop == sta)
-                       mesh_path_del(mpath->dst, mpath->dev);
+                       mesh_path_del(mpath->dst, mpath->sdata);
        }
 }
 
-void mesh_path_flush(struct net_device *dev)
+void mesh_path_flush(struct ieee80211_sub_if_data *sdata)
 {
        struct mesh_path *mpath;
        struct mpath_node *node;
@@ -290,19 +508,18 @@ void mesh_path_flush(struct net_device *dev)
 
        for_each_mesh_entry(mesh_paths, p, node, i) {
                mpath = node->mpath;
-               if (mpath->dev == dev)
-                       mesh_path_del(mpath->dst, mpath->dev);
+               if (mpath->sdata == sdata)
+                       mesh_path_del(mpath->dst, mpath->sdata);
        }
 }
 
 static void mesh_path_node_reclaim(struct rcu_head *rp)
 {
        struct mpath_node *node = container_of(rp, struct mpath_node, rcu);
-       struct ieee80211_sub_if_data *sdata =
-               IEEE80211_DEV_TO_SUB_IF(node->mpath->dev);
+       struct ieee80211_sub_if_data *sdata = node->mpath->sdata;
 
        del_timer_sync(&node->mpath->timer);
-       atomic_dec(&sdata->u.sta.mpaths);
+       atomic_dec(&sdata->u.mesh.mpaths);
        kfree(node->mpath);
        kfree(node);
 }
@@ -311,11 +528,11 @@ static void mesh_path_node_reclaim(struct rcu_head *rp)
  * mesh_path_del - delete a mesh path from the table
  *
  * @addr: dst address (ETH_ALEN length)
- * @dev: local interface
+ * @sdata: local subif
  *
  * Returns: 0 if succesful
  */
-int mesh_path_del(u8 *addr, struct net_device *dev)
+int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
 {
        struct mesh_path *mpath;
        struct mpath_node *node;
@@ -325,13 +542,13 @@ int mesh_path_del(u8 *addr, struct net_device *dev)
        int err = 0;
 
        read_lock(&pathtbl_resize_lock);
-       hash_idx = mesh_table_hash(addr, dev, mesh_paths);
+       hash_idx = mesh_table_hash(addr, sdata, mesh_paths);
        bucket = &mesh_paths->hash_buckets[hash_idx];
 
        spin_lock(&mesh_paths->hashwlock[hash_idx]);
        hlist_for_each_entry(node, n, bucket, list) {
                mpath = node->mpath;
-               if (mpath->dev == dev &&
+               if (mpath->sdata == sdata &&
                                memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
                        spin_lock_bh(&mpath->state_lock);
                        mpath->flags |= MESH_PATH_RESOLVING;
@@ -345,6 +562,7 @@ int mesh_path_del(u8 *addr, struct net_device *dev)
 
        err = -ENXIO;
 enddel:
+       mesh_paths_generation++;
        spin_unlock(&mesh_paths->hashwlock[hash_idx]);
        read_unlock(&pathtbl_resize_lock);
        return err;
@@ -360,47 +578,44 @@ enddel:
  */
 void mesh_path_tx_pending(struct mesh_path *mpath)
 {
-       struct sk_buff *skb;
-
-       while ((skb = skb_dequeue(&mpath->frame_queue)) &&
-                       (mpath->flags & MESH_PATH_ACTIVE))
-               dev_queue_xmit(skb);
+       if (mpath->flags & MESH_PATH_ACTIVE)
+               ieee80211_add_pending_skbs(mpath->sdata->local,
+                               &mpath->frame_queue);
 }
 
 /**
  * mesh_path_discard_frame - discard a frame whose path could not be resolved
  *
  * @skb: frame to discard
- * @dev: network device the frame was to be sent through
+ * @sdata: network subif the frame was to be sent through
  *
- * If the frame was beign forwarded from another MP, a PERR frame will be sent
- * to the precursor.
+ * If the frame was being forwarded from another MP, a PERR frame will be sent
+ * to the precursor.  The precursor's address (i.e. the previous hop) was saved
+ * in addr1 of the frame-to-be-forwarded, and would only be overwritten once
+ * the destination is successfully resolved.
  *
  * Locking: the function must me called within a rcu_read_lock region
  */
-void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev)
+void mesh_path_discard_frame(struct sk_buff *skb,
+                            struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
        struct mesh_path *mpath;
        u32 dsn = 0;
 
-       if (skb->pkt_type == PACKET_OTHERHOST) {
-               struct ieee80211s_hdr *prev_meshhdr;
-               int mshhdrlen;
+       if (memcmp(hdr->addr4, sdata->dev->dev_addr, ETH_ALEN) != 0) {
                u8 *ra, *da;
 
-               prev_meshhdr = ((struct ieee80211s_hdr *)skb->cb);
-               mshhdrlen = ieee80211_get_mesh_hdrlen(prev_meshhdr);
-               da = skb->data;
-               ra = MESH_PREQ(skb);
-               mpath = mesh_path_lookup(da, dev);
+               da = hdr->addr3;
+               ra = hdr->addr1;
+               mpath = mesh_path_lookup(da, sdata);
                if (mpath)
                        dsn = ++mpath->dsn;
-               mesh_path_error_tx(skb->data, cpu_to_le32(dsn), ra, dev);
+               mesh_path_error_tx(skb->data, cpu_to_le32(dsn), ra, sdata);
        }
 
        kfree_skb(skb);
-       sdata->u.sta.mshstats.dropped_frames_no_route++;
+       sdata->u.mesh.mshstats.dropped_frames_no_route++;
 }
 
 /**
@@ -412,14 +627,11 @@ void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev)
  */
 void mesh_path_flush_pending(struct mesh_path *mpath)
 {
-       struct ieee80211_sub_if_data *sdata;
        struct sk_buff *skb;
 
-       sdata = IEEE80211_DEV_TO_SUB_IF(mpath->dev);
-
        while ((skb = skb_dequeue(&mpath->frame_queue)) &&
                        (mpath->flags & MESH_PATH_ACTIVE))
-               mesh_path_discard_frame(skb, mpath->dev);
+               mesh_path_discard_frame(skb, mpath->sdata);
 }
 
 /**
@@ -450,39 +662,52 @@ static void mesh_path_node_free(struct hlist_node *p, bool free_leafs)
        struct mpath_node *node = hlist_entry(p, struct mpath_node, list);
        mpath = node->mpath;
        hlist_del_rcu(p);
-       synchronize_rcu();
        if (free_leafs)
                kfree(mpath);
        kfree(node);
 }
 
-static void mesh_path_node_copy(struct hlist_node *p, struct mesh_table *newtbl)
+static int mesh_path_node_copy(struct hlist_node *p, struct mesh_table *newtbl)
 {
        struct mesh_path *mpath;
        struct mpath_node *node, *new_node;
        u32 hash_idx;
 
+       new_node = kmalloc(sizeof(struct mpath_node), GFP_ATOMIC);
+       if (new_node == NULL)
+               return -ENOMEM;
+
        node = hlist_entry(p, struct mpath_node, list);
        mpath = node->mpath;
-       new_node = kmalloc(sizeof(struct mpath_node), GFP_KERNEL);
        new_node->mpath = mpath;
-       hash_idx = mesh_table_hash(mpath->dst, mpath->dev, newtbl);
+       hash_idx = mesh_table_hash(mpath->dst, mpath->sdata, newtbl);
        hlist_add_head(&new_node->list,
                        &newtbl->hash_buckets[hash_idx]);
+       return 0;
 }
 
 int mesh_pathtbl_init(void)
 {
        mesh_paths = mesh_table_alloc(INIT_PATHS_SIZE_ORDER);
+       if (!mesh_paths)
+               return -ENOMEM;
        mesh_paths->free_node = &mesh_path_node_free;
        mesh_paths->copy_node = &mesh_path_node_copy;
        mesh_paths->mean_chain_len = MEAN_CHAIN_LEN;
-       if (!mesh_paths)
+
+       mpp_paths = mesh_table_alloc(INIT_PATHS_SIZE_ORDER);
+       if (!mpp_paths) {
+               mesh_table_free(mesh_paths, true);
                return -ENOMEM;
+       }
+       mpp_paths->free_node = &mesh_path_node_free;
+       mpp_paths->copy_node = &mesh_path_node_copy;
+       mpp_paths->mean_chain_len = MEAN_CHAIN_LEN;
+
        return 0;
 }
 
-void mesh_path_expire(struct net_device *dev)
+void mesh_path_expire(struct ieee80211_sub_if_data *sdata)
 {
        struct mesh_path *mpath;
        struct mpath_node *node;
@@ -491,7 +716,7 @@ void mesh_path_expire(struct net_device *dev)
 
        read_lock(&pathtbl_resize_lock);
        for_each_mesh_entry(mesh_paths, p, node, i) {
-               if (node->mpath->dev != dev)
+               if (node->mpath->sdata != sdata)
                        continue;
                mpath = node->mpath;
                spin_lock_bh(&mpath->state_lock);
@@ -500,7 +725,7 @@ void mesh_path_expire(struct net_device *dev)
                        time_after(jiffies,
                         mpath->exp_time + MESH_PATH_EXPIRE)) {
                        spin_unlock_bh(&mpath->state_lock);
-                       mesh_path_del(mpath->dst, mpath->dev);
+                       mesh_path_del(mpath->dst, mpath->sdata);
                } else
                        spin_unlock_bh(&mpath->state_lock);
        }
@@ -510,4 +735,5 @@ void mesh_path_expire(struct net_device *dev)
 void mesh_pathtbl_unregister(void)
 {
        mesh_table_free(mesh_paths, true);
+       mesh_table_free(mpp_paths, true);
 }