summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-05-07 19:57:11 +0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-21 21:47:45 -0400
commitbd9b448f4c0a514559bdae4ca18ca3e8cd999c6d (patch)
tree090c74c16e3660e329d92f6435d28732401c1a5d /net/mac80211
parenta3538b19a6d226f9d3d9b18865468370009dec55 (diff)
downloadop-kernel-dev-bd9b448f4c0a514559bdae4ca18ca3e8cd999c6d.zip
op-kernel-dev-bd9b448f4c0a514559bdae4ca18ca3e8cd999c6d.tar.gz
mac80211: Consolidate hash kfree-ing in mesh.c.
There are already two places, that kfree the mesh_table and its buckets. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index cbce001..b5933b2 100644
--- 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)
@@ -378,9 +383,7 @@ errcopy:
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;
}
OpenPOWER on IntegriCloud