mac80211: tx, use dev_kfree_skb_any for beacon_get

[linux-2.6] / net / mac80211 / mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index ca81d0065eb8f7660a95b721d4119999ed58fdbd..b5933b271491551bc10edacdfda4416be6b8125d 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -315,6 +315,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,9 +337,7 @@ 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)
@@ -350,20 +355,15 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
        struct mesh_table *newtbl;
        struct hlist_head *oldhash;
        struct hlist_node *p, *q;
-       int err = 0;
        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;
@@ -376,20 +376,15 @@ struct mesh_table *mesh_table_grow(struct mesh_table *tbl)
                        if (tbl->copy_node(p, newtbl) < 0)
                                goto errcopy;
 
-endgrow:
-       if (err)
-               return NULL;
-       else
-               return newtbl;
+       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);
        }
-       kfree(newtbl->hash_buckets);
-       kfree(newtbl->hashwlock);
-       kfree(newtbl);
+       __mesh_table_free(tbl);
+endgrow:
        return NULL;
 }